From cac38c8664fd60f4076061c16a44355e103d9d29 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Sun, 24 May 2015 16:31:59 +0000 Subject: [PATCH 001/157] extraBindsRO/extraBindsRW --- nixos/modules/virtualisation/containers.nix | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index da39dda8535..512b4ee15ec 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -127,6 +127,27 @@ in Wether the container is automatically started at boot-time. ''; }; + + extraBindsRO = mkOption { + type = types.listOf types.str; + default = []; + example = [ "/home/alice" ]; + description = + '' + An extra list of directories that is bound to the container with read-only permission. + ''; + }; + + extraBindsRW = mkOption { + type = types.listOf types.str; + default = []; + example = [ "/home/alice" ]; + description = + '' + An extra list of directories that is bound to the container with read-only permission. + ''; + }; + }; config = mkMerge @@ -230,12 +251,15 @@ in fi ''} + + # Run systemd-nspawn without startup notification (we'll # wait for the container systemd to signal readiness). EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \ exec ${config.systemd.package}/bin/systemd-nspawn \ --keep-unit \ -M "$INSTANCE" -D "$root" $extraFlags \ + $EXTRABINDS \ --bind-ro=/nix/store \ --bind-ro=/nix/var/nix/db \ --bind-ro=/nix/var/nix/daemon-socket \ @@ -334,6 +358,9 @@ in ${optionalString cfg.autoStart '' AUTO_START=1 ''} + + EXTRABINDS="${concatMapStrings (d: " --bind-ro=${d}") cfg.extraBindsRO + concatMapStrings (d: " --bind=${d}") cfg.extraBindsRW}" + ''; }) config.containers; From c4f66eb85d721dcb97f717d4a6f28c3de3ff0f47 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 25 May 2015 19:09:53 +0000 Subject: [PATCH 002/157] unify extraBindsRW/RO into extraBinds. Now arbitrary mount point is supported. --- nixos/modules/virtualisation/containers.nix | 37 +++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 512b4ee15ec..bfc75ea3efc 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -41,6 +41,9 @@ let system = config.nixpkgs.system; + mkBindFlag = d: if d.isReadOnly then " --bind-ro=${d.host}:${d.container}" else " --bind=${d.host}:${d.container}"; + mkBindFlags = bs: concatMapStrings mkBindFlag bs; + in { @@ -128,25 +131,28 @@ in ''; }; - extraBindsRO = mkOption { - type = types.listOf types.str; + extraBinds = mkOption { + type = types.listOf types.attrs; default = []; - example = [ "/home/alice" ]; + example = [ { host = "/home/alice"; + container = "/home"; + isReadOnly = false; } + ]; description = '' - An extra list of directories that is bound to the container with read-only permission. + An extra list of directories that is bound to the container. ''; }; - extraBindsRW = mkOption { - type = types.listOf types.str; - default = []; - example = [ "/home/alice" ]; - description = - '' - An extra list of directories that is bound to the container with read-only permission. - ''; - }; + #extraBindsRW = mkOption { + # type = types.listOf types.str; + # default = []; + # example = [ "/home/alice" ]; + # description = + # '' + # An extra list of directories that is bound to the container with read-only permission. + # ''; + #}; }; @@ -359,11 +365,14 @@ in AUTO_START=1 ''} - EXTRABINDS="${concatMapStrings (d: " --bind-ro=${d}") cfg.extraBindsRO + concatMapStrings (d: " --bind=${d}") cfg.extraBindsRW}" + EXTRABINDS="${mkBindFlags cfg.extraBinds}" ''; }) config.containers; + #"${concatMapStrings (d: " --bind-ro=${d}") cfg.extraBindsRO + concatMapStrings (d: " --bind=${d}") cfg.extraBindsRW}" + + # Generate /etc/hosts entries for the containers. networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null) '' From 4d551227c92614b1d180ec99682e714623dbbb3b Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Tue, 26 May 2015 11:56:42 +0000 Subject: [PATCH 003/157] nixos-container: rename extraBinds to bindMounts and use attribute set format. --- nixos/modules/virtualisation/containers.nix | 70 +++++++++++++-------- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index bfc75ea3efc..86c17503fbc 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -41,8 +41,40 @@ let system = config.nixpkgs.system; - mkBindFlag = d: if d.isReadOnly then " --bind-ro=${d.host}:${d.container}" else " --bind=${d.host}:${d.container}"; - mkBindFlags = bs: concatMapStrings mkBindFlag bs; + bindMountOpts = { name, config, ... }: { + + options = { + mountPoint = mkOption { + example = "/mnt/usb"; + type = types.str; + description = "Location of the mounted in the container file systems"; + }; + hostPath = mkOption { + default = null; + example = "/home/alice"; + type = types.uniq (types.nullOr types.string); + description = "Location of the host path to be mounted"; + }; + isReadOnly = mkOption { + default = false; + example = true; + type = types.bool; + description = "Determine whether the mounted path will be accessed in read-only mode"; + }; + }; + + config = { + mountPoint = mkDefault name; + }; + + }; + + mkBindFlag = d: + let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind="; + mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}"; + in flagPrefix + mountstr ; + + mkBindFlags = bs: concatMapStrings mkBindFlag (lib.attrValues bs); in @@ -131,29 +163,20 @@ in ''; }; - extraBinds = mkOption { - type = types.listOf types.attrs; - default = []; - example = [ { host = "/home/alice"; - container = "/home"; - isReadOnly = false; } - ]; + bindMounts = mkOption { + type = types.loaOf types.optionSet; + options = [ bindMountOpts ]; + default = {}; + example = { "/home" = { hostPath = "/home/alice"; + isReadOnly = false; }; + }; + description = - '' + '' An extra list of directories that is bound to the container. ''; }; - #extraBindsRW = mkOption { - # type = types.listOf types.str; - # default = []; - # example = [ "/home/alice" ]; - # description = - # '' - # An extra list of directories that is bound to the container with read-only permission. - # ''; - #}; - }; config = mkMerge @@ -265,7 +288,7 @@ in exec ${config.systemd.package}/bin/systemd-nspawn \ --keep-unit \ -M "$INSTANCE" -D "$root" $extraFlags \ - $EXTRABINDS \ + $EXTRABINDS \ --bind-ro=/nix/store \ --bind-ro=/nix/var/nix/db \ --bind-ro=/nix/var/nix/daemon-socket \ @@ -365,14 +388,11 @@ in AUTO_START=1 ''} - EXTRABINDS="${mkBindFlags cfg.extraBinds}" + EXTRABINDS="${mkBindFlags cfg.bindMounts}" ''; }) config.containers; - #"${concatMapStrings (d: " --bind-ro=${d}") cfg.extraBindsRO + concatMapStrings (d: " --bind=${d}") cfg.extraBindsRW}" - - # Generate /etc/hosts entries for the containers. networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null) '' From ae2279bcdb93cbe382832c1e0319be8b614ae63f Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Tue, 26 May 2015 13:41:31 +0000 Subject: [PATCH 004/157] nixos-containers: bindMounts: change default to readOnly. use EXTRA_NSPAWN_FLAGS --- nixos/modules/virtualisation/containers.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 86c17503fbc..217ef62a1f6 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -47,7 +47,7 @@ let mountPoint = mkOption { example = "/mnt/usb"; type = types.str; - description = "Location of the mounted in the container file systems"; + description = "Mount point on the container file system"; }; hostPath = mkOption { default = null; @@ -56,7 +56,7 @@ let description = "Location of the host path to be mounted"; }; isReadOnly = mkOption { - default = false; + default = true; example = true; type = types.bool; description = "Determine whether the mounted path will be accessed in read-only mode"; @@ -288,7 +288,7 @@ in exec ${config.systemd.package}/bin/systemd-nspawn \ --keep-unit \ -M "$INSTANCE" -D "$root" $extraFlags \ - $EXTRABINDS \ + $EXTRA_NSPAWN_FLAGS \ --bind-ro=/nix/store \ --bind-ro=/nix/var/nix/db \ --bind-ro=/nix/var/nix/daemon-socket \ @@ -384,12 +384,10 @@ in LOCAL_ADDRESS=${cfg.localAddress} ''} ''} - ${optionalString cfg.autoStart '' - AUTO_START=1 - ''} - - EXTRABINDS="${mkBindFlags cfg.bindMounts}" - + ${optionalString cfg.autoStart '' + AUTO_START=1 + ''} + EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}" ''; }) config.containers; From c6b031d32bae47f497050f5586ecd3f5ed3740b6 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 28 Sep 2015 05:48:16 +0000 Subject: [PATCH 005/157] minor changes --- nixos/modules/virtualisation/containers.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 217ef62a1f6..6012499b068 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -47,19 +47,19 @@ let mountPoint = mkOption { example = "/mnt/usb"; type = types.str; - description = "Mount point on the container file system"; + description = "Mount point on the container file system."; }; hostPath = mkOption { default = null; example = "/home/alice"; - type = types.uniq (types.nullOr types.string); - description = "Location of the host path to be mounted"; + type = types.nullOr types.str; + description = "Location of the host path to be mounted."; }; isReadOnly = mkOption { default = true; example = true; type = types.bool; - description = "Determine whether the mounted path will be accessed in read-only mode"; + description = "Determine whether the mounted path will be accessed in read-only mode."; }; }; From f933b48a53bf0284e1901a45325a3ae98050c1d7 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Sun, 28 Jun 2015 21:25:19 +0300 Subject: [PATCH 006/157] darwin: matplotlib: add needed inputs and set framework flag for darwin --- .../python-modules/matplotlib/darwin-stdenv.patch | 11 +++++++++++ .../development/python-modules/matplotlib/default.nix | 11 +++++++++-- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/matplotlib/darwin-stdenv.patch diff --git a/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch b/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch new file mode 100644 index 00000000000..6e780dfb5a0 --- /dev/null +++ b/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch @@ -0,0 +1,11 @@ +--- a/src/_macosx.m 2015-06-30 12:18:48.000000000 +0300 ++++ b/src/_macosx.m 2015-06-30 12:19:12.000000000 +0300 +@@ -5,6 +5,8 @@ + #include "numpy/arrayobject.h" + #include "path_cleanup.h" + ++#define WITH_NEXT_FRAMEWORK 1 ++ + #if PY_MAJOR_VERSION >= 3 + #define PY3K 1 + #else diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index b6789a851cb..995b1459f04 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -4,6 +4,7 @@ , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection , enableGtk3 ? false, cairo +, Cocoa, Foundation, CoreData, cf-private, libobjc, libcxx }: assert enableGhostscript -> ghostscript != null; @@ -17,11 +18,15 @@ buildPythonPackage rec { url = "https://pypi.python.org/packages/source/m/matplotlib/${name}.tar.gz"; sha256 = "67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646"; }; - + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + XDG_RUNTIME_DIR = "/tmp"; buildInputs = [ python which sphinx stdenv ] - ++ stdenv.lib.optional enableGhostscript ghostscript; + ++ stdenv.lib.optional enableGhostscript ghostscript + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation CoreData + cf-private libobjc ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype @@ -30,6 +35,8 @@ buildPythonPackage rec { ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ]; + patchPhase = '' # Failing test: ERROR: matplotlib.tests.test_style.test_use_url sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 292b758b5c0..7b6ab6a103b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8621,6 +8621,8 @@ let matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; enableGhostscript = true; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation CoreData; + inherit (pkgs.darwin) cf-private libobjc; }; From 80fd9e96bea93dff46aa51abe8fe40f4a3e70408 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Sun, 1 Nov 2015 14:55:06 +0200 Subject: [PATCH 007/157] darwin: matplotlib: update darwin patch for 1.5.0 --- .../matplotlib/darwin-stdenv.patch | 19 +++++++++---------- .../python-modules/matplotlib/default.nix | 3 +-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch b/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch index 6e780dfb5a0..ca399b4e684 100644 --- a/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch +++ b/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch @@ -1,11 +1,10 @@ ---- a/src/_macosx.m 2015-06-30 12:18:48.000000000 +0300 -+++ b/src/_macosx.m 2015-06-30 12:19:12.000000000 +0300 -@@ -5,6 +5,8 @@ - #include "numpy/arrayobject.h" - #include "path_cleanup.h" +--- a/src/_macosx.m 2015-10-30 00:46:20.000000000 +0200 ++++ b/src/_macosx.m 2015-11-01 14:52:25.000000000 +0200 +@@ -6264,6 +6264,7 @@ -+#define WITH_NEXT_FRAMEWORK 1 -+ - #if PY_MAJOR_VERSION >= 3 - #define PY3K 1 - #else + static bool verify_framework(void) + { ++ return true; /* nixpkgs darwin stdenv */ + #ifdef COMPILING_FOR_10_6 + NSRunningApplication* app = [NSRunningApplication currentApplication]; + NSApplicationActivationPolicy activationPolicy = [app activationPolicy]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 995b1459f04..6eadbcb5b65 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -37,14 +37,13 @@ buildPythonPackage rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ]; - patchPhase = '' + prePatch = '' # Failing test: ERROR: matplotlib.tests.test_style.test_use_url sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py # Failing test: ERROR: test suite for sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py ''; - meta = with stdenv.lib; { description = "python plotting library, making publication quality plots"; homepage = "http://matplotlib.sourceforge.net/"; From a639e51760a5a52b04a415fd558ce63387bdce15 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Feb 2015 22:53:01 +0100 Subject: [PATCH 008/157] chrony: 2.1.1 -> 2.2 --- pkgs/tools/networking/chrony/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 3acf921cd79..7d50a4d430e 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,13 +5,13 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "2.1.1"; - + version = "2.2"; + src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4"; + sha256 = "1194maargy4hpl2a3vy5mbrrswzajjdn92p4w17gbb9vlq7q5zfk"; }; - + buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap; configureFlags = [ From 596b06bd1ca3a0f97c06dd84038775c291dae5ec Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Jul 2015 05:58:29 +0200 Subject: [PATCH 009/157] chrony: Build with NSS for secure hash support --- pkgs/tools/networking/chrony/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 7d50a4d430e..dc049a6f808 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, readline, texinfo }: +{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr }: assert stdenv.isLinux -> libcap != null; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1194maargy4hpl2a3vy5mbrrswzajjdn92p4w17gbb9vlq7q5zfk"; }; - buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap; + buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--sysconfdir=$(out)/etc" From 1a79058a8185342f1703d1ab579c8a81abfcda22 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Jul 2015 05:59:53 +0200 Subject: [PATCH 010/157] chrony: Add fpletz to maintainers --- pkgs/tools/networking/chrony/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index dc049a6f808..e004525e120 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { repository.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils fpletz ]; longDescription = '' Chronyd is a daemon which runs in background on the system. It obtains measurements via the network of the system clock’s offset relative to time servers on other systems and adjusts the system time accordingly. For isolated systems, the user can periodically enter the correct time by hand (using Chronyc). In either case, Chronyd determines the rate at which the computer gains or loses time, and compensates for this. Chronyd implements the NTP protocol and can act as either a client or a server. From c459e269eb378092ab166e8e9176d79752db7b27 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Jul 2015 06:01:41 +0200 Subject: [PATCH 011/157] chrony service: Integration with other ntp daemons --- nixos/modules/services/networking/chrony.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index fe062b30e4b..3c2d260de83 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -47,12 +47,7 @@ in }; servers = mkOption { - default = [ - "0.nixos.pool.ntp.org" - "1.nixos.pool.ntp.org" - "2.nixos.pool.ntp.org" - "3.nixos.pool.ntp.org" - ]; + default = config.services.ntp.servers; description = '' The set of NTP servers from which to synchronise. ''; @@ -90,6 +85,8 @@ in # Make chronyc available in the system path environment.systemPackages = [ pkgs.chrony ]; + systemd.services.ntpd.enable = false; + users.extraUsers = singleton { name = chronyUser; uid = config.ids.uids.chrony; @@ -102,6 +99,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; path = [ chrony ]; From d89f269b26b9e98beb6f1ce9dfa7fab659d61ce7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Jul 2015 07:13:04 +0200 Subject: [PATCH 012/157] chrony service: Members of group chrony can use chronyc --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/networking/chrony.nix | 61 ++++++++++++-------- pkgs/tools/networking/chrony/default.nix | 1 - 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index de9a318fdd2..7ade145ad73 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -303,7 +303,7 @@ nslcd = 58; scanner = 59; nginx = 60; - #chrony = 61; # unused + chrony = 61; systemd-journal = 62; smtpd = 63; smtpq = 64; diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index 3c2d260de83..1cd678e7c62 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -8,26 +8,10 @@ let stateDir = "/var/lib/chrony"; - chronyUser = "chrony"; + keyFile = "/etc/chrony.keys"; cfg = config.services.chrony; - configFile = pkgs.writeText "chrony.conf" '' - ${toString (map (server: "server " + server + "\n") cfg.servers)} - - ${optionalString cfg.initstepslew.enabled '' - initstepslew ${toString cfg.initstepslew.threshold} ${toString (map (server: server + " ") cfg.initstepslew.servers)} - ''} - - driftfile ${stateDir}/chrony.drift - - ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"} - - ${cfg.extraConfig} - ''; - - chronyFlags = "-m -f ${configFile} -u ${chronyUser}"; - in { @@ -85,31 +69,60 @@ in # Make chronyc available in the system path environment.systemPackages = [ pkgs.chrony ]; - systemd.services.ntpd.enable = false; + environment.etc."chrony.conf".text = + '' + ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers} + + ${optionalString + cfg.initstepslew.enabled + "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}" + } + + driftfile ${stateDir}/chrony.drift + + keyfile ${keyFile} + generatecommandkey + + ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"} + + ${cfg.extraConfig} + ''; + + users.extraGroups = singleton + { name = "chrony"; + gid = config.ids.gids.chrony; + }; users.extraUsers = singleton - { name = chronyUser; + { name = "chrony"; uid = config.ids.uids.chrony; + group = "chrony"; description = "chrony daemon user"; home = stateDir; }; - jobs.chronyd = - { description = "chrony daemon"; + systemd.services.ntpd.enable = false; + + systemd.services.chronyd = + { description = "chrony NTP daemon"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; - path = [ chrony ]; + path = [ pkgs.chrony ]; preStart = '' mkdir -m 0755 -p ${stateDir} - chown ${chronyUser} ${stateDir} + touch ${keyFile} + chmod 0640 ${keyFile} + chown chrony:chrony ${stateDir} ${keyFile} ''; - exec = "chronyd -n ${chronyFlags}"; + serviceConfig = + { ExecStart = "${pkgs.chrony}/bin/chronyd -n -m -u chrony"; + }; }; }; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index e004525e120..dca92c565af 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; configureFlags = [ - "--sysconfdir=$(out)/etc" "--chronyvardir=$(out)/var/lib/chrony" ]; From 8af2fb01ac339d0c7105f44b7facbfa8f674380d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Mon, 9 Nov 2015 00:42:12 +0100 Subject: [PATCH 013/157] python: lxml: 3.3.6 -> 3.4.4 --- pkgs/top-level/python-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b625119aa92..7d6bce6b85f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8689,19 +8689,22 @@ let }; lxml = buildPythonPackage ( rec { - name = "lxml-3.3.6"; + name = "lxml-3.4.4"; + # Warning : as of nov. 9th, 2015, version 3.5.0b1 breaks a lot of things, + # more work is needed before upgrading src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz"; - md5 = "a804b36864c483fe7abdd7f493a0c379"; + sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; }; buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; meta = { description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://codespeak.net/lxml/index.html; - license = "BSD"; + homepage = http://lxml.de; + license = licenses.bsd3; + maintainers = with maintainers; [ sjourdois ]; }; }); From cec8303926256796788b2eade9c4688f409ccfec Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 17 Nov 2015 15:29:45 +0100 Subject: [PATCH 014/157] faust: add version 2 and make it the default --- pkgs/applications/audio/faust/default.nix | 25 ++- pkgs/applications/audio/faust/faust1.nix | 209 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 231 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/audio/faust/faust1.nix diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/default.nix index 722c762b7b4..91e9fb66659 100644 --- a/pkgs/applications/audio/faust/default.nix +++ b/pkgs/applications/audio/faust/default.nix @@ -1,20 +1,26 @@ { stdenv , coreutils -, fetchgit +, fetchurl , makeWrapper , pkgconfig +, clang +, llvm +, emscripten +, openssl +, libsndfile +, libmicrohttpd +, vim }: with stdenv.lib.strings; let - version = "8-1-2015"; + version = "2.0-a41"; - src = fetchgit { - url = git://git.code.sf.net/p/faudiostream/code; - rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce"; - sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/faudiostream/faust-2.0.a41.tgz"; + sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm"; }; meta = with stdenv.lib; { @@ -31,19 +37,22 @@ let inherit src; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper llvm emscripten openssl libsndfile pkgconfig libmicrohttpd vim ]; + passthru = { inherit wrap wrapWithBuildEnv; }; + preConfigure = '' - makeFlags="$makeFlags prefix=$out" + makeFlags="$makeFlags prefix=$out LLVM_CONFIG='${llvm}/bin/llvm-config' world" # The faust makefiles use 'system ?= $(shell uname -s)' but nix # defines 'system' env var, so undefine that so faust detects the # correct system. unset system + sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix ''; # Remove most faust2appl scripts since they won't run properly diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix new file mode 100644 index 00000000000..722c762b7b4 --- /dev/null +++ b/pkgs/applications/audio/faust/faust1.nix @@ -0,0 +1,209 @@ +{ stdenv +, coreutils +, fetchgit +, makeWrapper +, pkgconfig +}: + +with stdenv.lib.strings; + +let + + version = "8-1-2015"; + + src = fetchgit { + url = git://git.code.sf.net/p/faudiostream/code; + rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce"; + sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0"; + }; + + meta = with stdenv.lib; { + homepage = http://faust.grame.fr/; + downloadPage = http://sourceforge.net/projects/faudiostream/files/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ magnetophon pmahoney ]; + }; + + faust = stdenv.mkDerivation { + + name = "faust-${version}"; + + inherit src; + + buildInputs = [ makeWrapper ]; + + passthru = { + inherit wrap wrapWithBuildEnv; + }; + + preConfigure = '' + makeFlags="$makeFlags prefix=$out" + + # The faust makefiles use 'system ?= $(shell uname -s)' but nix + # defines 'system' env var, so undefine that so faust detects the + # correct system. + unset system + ''; + + # Remove most faust2appl scripts since they won't run properly + # without additional paths setup. See faust.wrap, + # faust.wrapWithBuildEnv. + postInstall = '' + # syntax error when eval'd directly + pattern="faust2!(svg)" + (shopt -s extglob; rm "$out"/bin/$pattern) + ''; + + postFixup = '' + # Set faustpath explicitly. + substituteInPlace "$out"/bin/faustpath \ + --replace "/usr/local /usr /opt /opt/local" "$out" + + # The 'faustoptflags' is 'source'd into other faust scripts and + # not used as an executable, so patch 'uname' usage directly + # rather than use makeWrapper. + substituteInPlace "$out"/bin/faustoptflags \ + --replace uname "${coreutils}/bin/uname" + + # wrapper for scripts that don't need faust.wrap* + for script in "$out"/bin/faust2*; do + wrapProgram "$script" \ + --prefix PATH : "$out"/bin + done + ''; + + meta = meta // { + description = "A functional programming language for realtime audio signal processing"; + longDescription = '' + FAUST (Functional Audio Stream) is a functional programming + language specifically designed for real-time signal processing + and synthesis. FAUST targets high-performance signal processing + applications and audio plug-ins for a variety of platforms and + standards. + The Faust compiler translates DSP specifications into very + efficient C++ code. Thanks to the notion of architecture, + FAUST programs can be easily deployed on a large variety of + audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, + puredata, csound, supercollider, pure, vst, coreaudio) without + any change to the FAUST code. + + This package has just the compiler, libraries, and headers. + Install faust2* for specific faust2appl scripts. + ''; + }; + + }; + + # Default values for faust2appl. + faust2ApplBase = + { baseName + , dir ? "tools/faust2appls" + , scripts ? [ baseName ] + , ... + }@args: + + args // { + name = "${baseName}-${version}"; + + inherit src; + + configurePhase = ":"; + + buildPhase = ":"; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + for script in ${concatStringsSep " " scripts}; do + cp "${dir}/$script" "$out/bin/" + done + + runHook postInstall + ''; + + postInstall = '' + # For the faust2appl script, change 'faustpath' and + # 'faustoptflags' to absolute paths. + for script in "$out"/bin/*; do + substituteInPlace "$script" \ + --replace ". faustpath" ". '${faust}/bin/faustpath'" \ + --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" + done + ''; + + meta = meta // { + description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; + }; + }; + + # Some 'faust2appl' scripts, such as faust2alsa, run faust to + # generate cpp code, then invoke the c++ compiler to build the code. + # This builder wraps these scripts in parts of the stdenv such that + # when the scripts are called outside any nix build, they behave as + # if they were running inside a nix build in terms of compilers and + # paths being configured (e.g. rpath is set so that compiled + # binaries link to the libs inside the nix store) + # + # The function takes two main args: the appl name (e.g. + # 'faust2alsa') and an optional list of propagatedBuildInputs. It + # returns a derivation that contains only the bin/${appl} script, + # wrapped up so that it will run as if it was inside a nix build + # with those build inputs. + # + # The build input 'faust' is automatically added to the + # propagatedBuildInputs. + wrapWithBuildEnv = + { baseName + , propagatedBuildInputs ? [ ] + , ... + }@args: + + stdenv.mkDerivation ((faust2ApplBase args) // { + + buildInputs = [ makeWrapper pkgconfig ]; + + propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; + + postFixup = '' + + # export parts of the build environment + for script in "$out"/bin/*; do + wrapProgram "$script" \ + --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --prefix PATH : "$PATH" \ + --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ + --set NIX_CFLAGS_COMPILE "\"$NIX_CFLAGS_COMPILE\"" \ + --set NIX_LDFLAGS "\"$NIX_LDFLAGS\"" + done + ''; + }); + + # Builder for 'faust2appl' scripts, such as faust2firefox that + # simply need to be wrapped with some dependencies on PATH. + # + # The build input 'faust' is automatically added to the PATH. + wrap = + { baseName + , runtimeInputs ? [ ] + , ... + }@args: + + let + + runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); + + in stdenv.mkDerivation ((faust2ApplBase args) // { + + buildInputs = [ makeWrapper ]; + + postFixup = '' + for script in "$out"/bin/*; do + wrapProgram "$script" --prefix PATH : "${runtimePath}" + done + ''; + + }); + +in faust diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e022c253a5..5ab1243c6c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15019,7 +15019,11 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; - faust = callPackage ../applications/audio/faust { }; + faust = faust2; + + faust1 = callPackage ../applications/audio/faust/faust1.nix { }; + + faust2 = callPackage ../applications/audio/faust { }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; From 991407f85810560c333a1b9c36ab2fed2042160b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 20 Nov 2015 20:26:02 +0100 Subject: [PATCH 015/157] nmap: 6.49BETA4 -> 7.00 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index faba4037d3d..c7d927bdb44 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "6.49BETA4"; + version = "7.00"; src = fetchurl { url = "http://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "042fg73w7596b3h6ha9y62ckc0hd352zv1shwip3dx14v5igrsna"; + sha256 = "1bh25200jidhb2ig206ibiwv1ngyrl2ka743hnihiihmqq0j6i4z"; }; patches = ./zenmap.patch; From fc2874d02e61cffb0bcc3e24a47349654c5845eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 17 Nov 2015 11:36:32 +0100 Subject: [PATCH 016/157] pypy: use the official sitePackages install path --- pkgs/development/interpreters/pypy/default.nix | 2 +- pkgs/development/interpreters/pypy/setup-hook.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index fe209f6f114..e82b4236325 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -119,7 +119,7 @@ let isPypy = true; buildEnv = callPackage ../python/wrapper.nix { python = self; }; interpreter = "${self}/bin/${executable}"; - sitePackages = "lib/${libPrefix}/site-packages"; + sitePackages = "site-packages"; }; enableParallelBuilding = true; # almost no parallelization without STM diff --git a/pkgs/development/interpreters/pypy/setup-hook.sh b/pkgs/development/interpreters/pypy/setup-hook.sh index c82179d9e87..e9081d1eaa5 100644 --- a/pkgs/development/interpreters/pypy/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.6/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.6/site-packages" + p="$i/site-packages" result="${result}${result:+:}$p" done echo $result From a2a6f60b5a1253a292d4db88a2b5955648e240c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 17 Nov 2015 11:38:26 +0100 Subject: [PATCH 017/157] WIP: buildPythonPackages now uses wheels internally --- .../bootstrapped-pip/default.nix | 47 +++++++ .../bootstrapped-pip/pip-7.0.1-prefix.patch | 119 ++++++++++++++++++ .../bootstrapped-pip/prefix.patch | 115 +++++++++++++++++ .../python-modules/generic/default.nix | 97 +++----------- pkgs/top-level/python-packages.nix | 21 ++-- 5 files changed, 313 insertions(+), 86 deletions(-) create mode 100644 pkgs/development/python-modules/bootstrapped-pip/default.nix create mode 100644 pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch create mode 100644 pkgs/development/python-modules/bootstrapped-pip/prefix.patch diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix new file mode 100644 index 00000000000..5578b3a83c4 --- /dev/null +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -0,0 +1,47 @@ +{ stdenv, python, fetchurl, makeWrapper, unzip }: + +let + wheel_source = fetchurl { + url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.26.0-py2.py3-none-any.whl"; + sha256 = "1sl642ncvipqx0hzypvl5hsiqngy0sib0kq242g4mic7vnid6bn9"; + }; + setuptools_source = fetchurl { + url = "https://pypi.python.org/packages/3.4/s/setuptools/setuptools-18.2-py2.py3-none-any.whl"; + sha256 = "0jhafl8wmjc8xigl1ib5hqiq9crmipcz0zcga52riymgqbf2bzh4"; + }; +in stdenv.mkDerivation rec { + name = "python-${python.version}-bootstrapped-pip-${version}"; + version = "7.1.2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl"; + sha256 = "133hx6jaspm6hd02gza66lng37l65yficc2y2x1gh16fbhxrilxr"; + }; + + unpackPhase = '' + mkdir -p $out/${python.sitePackages} + unzip -d $out/${python.sitePackages} $src + unzip -d $out/${python.sitePackages} ${setuptools_source} + unzip -d $out/${python.sitePackages} ${wheel_source} + ''; + + buildInputs = [ python makeWrapper unzip ]; + + installPhase = '' + mkdir -p $out/bin + + # patch pip to support "pip install --prefix" + pushd $out/${python.sitePackages}/ + patch -p1 < ${./pip-7.0.1-prefix.patch} + popd + + # install pip binary + echo '${python.interpreter} -m pip "$@"' > $out/bin/pip + chmod +x $out/bin/pip + + # wrap binaries with PYTHONPATH + for f in $out/bin/*; do + wrapProgram $f --prefix PYTHONPATH ":" $out/${python.sitePackages}/ + done + ''; +} diff --git a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch b/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch new file mode 100644 index 00000000000..1dc7cc5dc3a --- /dev/null +++ b/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch @@ -0,0 +1,119 @@ +commit e87c83d95bb91acdca92202e94488ca51a70e059 +Author: Domen Kožar +Date: Mon Nov 16 17:39:44 2015 +0100 + + WIP + +diff --git a/pip/commands/install.py b/pip/commands/install.py +index dbcf100..05d5a08 100644 +--- a/pip/commands/install.py ++++ b/pip/commands/install.py +@@ -139,6 +139,13 @@ class InstallCommand(RequirementCommand): + "directory.") + + cmd_opts.add_option( ++ '--prefix', ++ dest='prefix_path', ++ metavar='dir', ++ default=None, ++ help="Installation prefix where lib, bin and other top-level folders are placed") ++ ++ cmd_opts.add_option( + "--compile", + action="store_true", + dest="compile", +@@ -309,6 +316,7 @@ class InstallCommand(RequirementCommand): + install_options, + global_options, + root=options.root_path, ++ prefix=options.prefix_path, + ) + reqs = sorted( + requirement_set.successfully_installed, +diff --git a/pip/locations.py b/pip/locations.py +index 4e6f65d..43aeb1f 100644 +--- a/pip/locations.py ++++ b/pip/locations.py +@@ -163,7 +163,7 @@ site_config_files = [ + + + def distutils_scheme(dist_name, user=False, home=None, root=None, +- isolated=False): ++ isolated=False, prefix=None): + """ + Return a distutils install scheme + """ +@@ -187,6 +187,8 @@ def distutils_scheme(dist_name, user=False, home=None, root=None, + i.user = user or i.user + if user: + i.prefix = "" ++ else: ++ i.prefix = prefix or i.prefix + i.home = home or i.home + i.root = root or i.root + i.finalize_options() +diff --git a/pip/req/req_install.py b/pip/req/req_install.py +index 7c5bf8f..6f80a18 100644 +--- a/pip/req/req_install.py ++++ b/pip/req/req_install.py +@@ -792,7 +792,7 @@ exec(compile( + else: + return True + +- def install(self, install_options, global_options=[], root=None): ++ def install(self, install_options, global_options=[], root=None, prefix=None): + if self.editable: + self.install_editable(install_options, global_options) + return +@@ -800,7 +800,7 @@ exec(compile( + version = pip.wheel.wheel_version(self.source_dir) + pip.wheel.check_compatibility(version, self.name) + +- self.move_wheel_files(self.source_dir, root=root) ++ self.move_wheel_files(self.source_dir, root=root, prefix=prefix) + self.install_succeeded = True + return + +@@ -833,6 +833,8 @@ exec(compile( + + if root is not None: + install_args += ['--root', root] ++ if prefix is not None: ++ install_args += ['--prefix', prefix] + + if self.pycompile: + install_args += ["--compile"] +@@ -988,12 +990,13 @@ exec(compile( + def is_wheel(self): + return self.link and self.link.is_wheel + +- def move_wheel_files(self, wheeldir, root=None): ++ def move_wheel_files(self, wheeldir, root=None, prefix=None): + move_wheel_files( + self.name, self.req, wheeldir, + user=self.use_user_site, + home=self.target_dir, + root=root, ++ prefix=prefix, + pycompile=self.pycompile, + isolated=self.isolated, + ) +diff --git a/pip/wheel.py b/pip/wheel.py +index 403f48b..14eb141 100644 +--- a/pip/wheel.py ++++ b/pip/wheel.py +@@ -234,12 +234,12 @@ def get_entrypoints(filename): + + + def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None, +- pycompile=True, scheme=None, isolated=False): ++ pycompile=True, scheme=None, isolated=False, prefix=None): + """Install a wheel""" + + if not scheme: + scheme = distutils_scheme( +- name, user=user, home=home, root=root, isolated=isolated ++ name, user=user, home=home, root=root, isolated=isolated, prefix=prefix, + ) + + if root_is_purelib(name, wheeldir): diff --git a/pkgs/development/python-modules/bootstrapped-pip/prefix.patch b/pkgs/development/python-modules/bootstrapped-pip/prefix.patch new file mode 100644 index 00000000000..e3e96659942 --- /dev/null +++ b/pkgs/development/python-modules/bootstrapped-pip/prefix.patch @@ -0,0 +1,115 @@ +diff --git a/pip/commands/install.py b/pip/commands/install.py +index ddaa470..b798433 100644 +--- a/pip/commands/install.py ++++ b/pip/commands/install.py +@@ -147,6 +147,13 @@ class InstallCommand(Command): + "directory.") + + cmd_opts.add_option( ++ '--prefix', ++ dest='prefix_path', ++ metavar='dir', ++ default=None, ++ help="Installation prefix where lib, bin and other top-level folders are placed") ++ ++ cmd_opts.add_option( + "--compile", + action="store_true", + dest="compile", +@@ -350,6 +357,7 @@ class InstallCommand(Command): + install_options, + global_options, + root=options.root_path, ++ prefix=options.prefix_path, + ) + reqs = sorted( + requirement_set.successfully_installed, +diff --git a/pip/locations.py b/pip/locations.py +index dfbc6da..b2f3383 100644 +--- a/pip/locations.py ++++ b/pip/locations.py +@@ -209,7 +209,7 @@ site_config_files = [ + + + def distutils_scheme(dist_name, user=False, home=None, root=None, +- isolated=False): ++ isolated=False, prefix=None): + """ + Return a distutils install scheme + """ +@@ -231,6 +231,10 @@ def distutils_scheme(dist_name, user=False, home=None, root=None, + # or user base for installations during finalize_options() + # ideally, we'd prefer a scheme class that has no side-effects. + i.user = user or i.user ++ if user: ++ i.prefix = "" ++ else: ++ i.prefix = prefix or i.prefix + i.home = home or i.home + i.root = root or i.root + i.finalize_options() +diff --git a/pip/req/req_install.py b/pip/req/req_install.py +index 38013c5..14b868b 100644 +--- a/pip/req/req_install.py ++++ b/pip/req/req_install.py +@@ -806,7 +806,7 @@ exec(compile( + else: + return True + +- def install(self, install_options, global_options=(), root=None): ++ def install(self, install_options, global_options=[], root=None, prefix=None): + if self.editable: + self.install_editable(install_options, global_options) + return +@@ -814,7 +814,7 @@ exec(compile( + version = pip.wheel.wheel_version(self.source_dir) + pip.wheel.check_compatibility(version, self.name) + +- self.move_wheel_files(self.source_dir, root=root) ++ self.move_wheel_files(self.source_dir, root=root, prefix=prefix) + self.install_succeeded = True + return + +@@ -839,6 +839,8 @@ exec(compile( + + if root is not None: + install_args += ['--root', root] ++ if prefix is not None: ++ install_args += ['--prefix', prefix] + + if self.pycompile: + install_args += ["--compile"] +@@ -1008,12 +1010,13 @@ exec(compile( + def is_wheel(self): + return self.link and self.link.is_wheel + +- def move_wheel_files(self, wheeldir, root=None): ++ def move_wheel_files(self, wheeldir, root=None, prefix=None): + move_wheel_files( + self.name, self.req, wheeldir, + user=self.use_user_site, + home=self.target_dir, + root=root, ++ prefix=prefix, + pycompile=self.pycompile, + isolated=self.isolated, + ) +diff --git a/pip/wheel.py b/pip/wheel.py +index 57246ca..738a6b0 100644 +--- a/pip/wheel.py ++++ b/pip/wheel.py +@@ -130,12 +130,12 @@ def get_entrypoints(filename): + + + def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None, +- pycompile=True, scheme=None, isolated=False): ++ pycompile=True, scheme=None, isolated=False, prefix=None): + """Install a wheel""" + + if not scheme: + scheme = distutils_scheme( +- name, user=user, home=home, root=root, isolated=isolated ++ name, user=user, home=home, root=root, isolated=isolated, prefix=prefix, + ) + + if root_is_purelib(name, wheeldir): diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4827f374585..75115526a41 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, unzip, wrapPython, lib, recursivePthLoader, distutils-cfg }: +{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip }: { name @@ -12,28 +12,18 @@ , buildInputs ? [] -# pass extra information to the distutils global configuration (think as global setup.cfg) -, distutilsExtraCfg ? "" - # propagate build dependencies so in case we have A -> B -> C, # C can import propagated packages by A , propagatedBuildInputs ? [] -# passed to "python setup.py install" -, setupPyInstallFlags ? [] - # passed to "python setup.py build" +# https://github.com/pypa/pip/issues/881 , setupPyBuildFlags ? [] # enable tests by default , doCheck ? true -# List of packages that should be added to the PYTHONPATH -# environment variable in programs built by this function. Packages -# in the standard `propagatedBuildInputs' variable are also added. -# The difference is that `pythonPath' is not propagated to the user -# environment. This is preferrable for programs because it doesn't -# pollute the user environment. +# DEPRECATED: use propagatedBuildInputs , pythonPath ? [] # used to disable derivation, useful for specific python versions @@ -59,19 +49,19 @@ if disabled then throw "${name} not supported for interpreter ${python.executable}" else +let + setuppy = "import setuptools, tokenize;__file__='setup.py';exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))"; +in python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { inherit doCheck; name = namePrefix + name; - buildInputs = [ - wrapPython setuptools - (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) - ] ++ buildInputs ++ pythonPath + buildInputs = [ wrapPython bootstrapped-pip ] ++ buildInputs ++ pythonPath ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); # propagate python/setuptools to active setup-hook in nix-shell - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python setuptools ]; + propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; pythonPath = pythonPath; @@ -79,86 +69,40 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { runHook preConfigure # patch python interpreter to write null timestamps when compiling python files - # with following var we tell python to activate the patch so that python doesn't - # try to update them when we freeze timestamps in nix store + # this way python doesn't try to update them when we freeze timestamps in nix store export DETERMINISTIC_BUILD=1 - # prepend following line to import setuptools before distutils - # this way we make sure setuptools monkeypatches distutils commands - # this way setuptools provides extra helpers such as "python setup.py test" - sed -i '0,/import distutils/s//import setuptools;import distutils/' setup.py - sed -i '0,/from distutils/s//import setuptools;from distutils/' setup.py - runHook postConfigure ''; checkPhase = attrs.checkPhase or '' - runHook preCheck - - ${python}/bin/${python.executable} setup.py test - - runHook postCheck + runHook preCheck + ${python.interpreter} -c "${setuppy}" test + runHook postCheck ''; buildPhase = attrs.buildPhase or '' runHook preBuild - - ${python}/bin/${python.executable} setup.py build ${lib.concatStringsSep " " setupPyBuildFlags} - + ${python.interpreter} -c "${setuppy}" bdist_wheel runHook postBuild ''; installPhase = attrs.installPhase or '' runHook preInstall - mkdir -p "$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$out/${python.sitePackages}" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --old-and-unmanageable \ - --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} - - # --install-lib: - # sometimes packages specify where files should be installed outside the usual - # python lib prefix, we override that back so all infrastructure (setup hooks) - # work as expected - - # --old-and-unmanagable: - # instruct setuptools not to use eggs but fallback to plan package install - # this also reduces one .pth file in the chain, but the main reason is to - # force install process to install only scripts for the package we are - # installing (otherwise it will install scripts also for dependencies) - - # A pth file might have been generated to load the package from - # within its own site-packages, rename this package not to - # collide with others. - eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth - if [ -e "$eapth" ]; then - # move colliding easy_install.pth to specifically named one - mv "$eapth" $(dirname "$eapth")/${name}.pth - fi - - # Remove any site.py files generated by easy_install as these - # cause collisions. If pth files are to be processed a - # corresponding site.py needs to be included in the PYTHONPATH. - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + pushd dist + ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out + popd runHook postInstall ''; postFixup = attrs.postFixup or '' - wrapPythonPrograms - - # TODO: document - createBuildInputsPth build-inputs "$buildInputStrings" - for inputsfile in propagated-build-inputs propagated-native-build-inputs; do - if test -e $out/nix-support/$inputsfile; then - createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" - fi - done - ''; + wrapPythonPrograms + ''; shellHook = attrs.shellHook or '' ${preShellHook} @@ -178,5 +122,4 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; }; - }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04d68744dab..d9190ca6792 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -126,6 +126,8 @@ let mpi = pkgs.openmpi; }; + bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; + nixpart = callPackage ../tools/filesystems/nixpart { }; # This is used for NixOps to make sure we won't break it with the next major @@ -3349,11 +3351,11 @@ let decorator = buildPythonPackage rec { name = "decorator-${version}"; - version = "3.4.2"; + version = "4.0.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/decorator/${name}.tar.gz"; - sha256 = "7320002ce61dea6aa24adc945d9d7831b3669553158905cdd12f5d0027b54b44"; + sha256 = "1qf3iiv401vhsdmf4bd08fwb3fq4xq769q2yl7zqqr1iml7w3l2s"; }; meta = { @@ -10860,7 +10862,6 @@ let sha256 = "a39ce0e321e40e9758bf7b9128d316c71b35b80eabc84f13df492083bb6f1cc6"; }; - buildPhase = "${python}/bin/${python.executable} setup.py build"; doCheck = false; postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc"; @@ -11110,6 +11111,10 @@ let sha256 = "0wf0k9xf5xzmi79418xq8zxwr7w7a4g4alv3dds9afb2l8bh9crg"; }; + patchPhase = '' + sed -i "s/test_gather_stats/noop/" futurist/tests/test_executors.py + ''; + propagatedBuildInputs = with self; [ contextlib2 pbr six monotonic futures eventlet ]; @@ -12839,7 +12844,6 @@ let buildInputs = with self; [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ]; disabled = isPy3k; - doCheck = true; postInstall = "ln -s $out/lib/${python.libPrefix}/site-packages $out/lib/${python.libPrefix}/site-packages/PIL"; @@ -12857,7 +12861,6 @@ let ''; checkPhase = "${python}/bin/${python.executable} selftest.py"; - buildPhase = "${python}/bin/${python.executable} setup.py build_ext -i"; meta = { homepage = http://www.pythonware.com/products/pil/; @@ -15790,8 +15793,6 @@ let patches = [ ../development/python-modules/rpkg-buildfix.diff ]; - # buildPhase = "python setup.py build"; - # doCheck = false; propagatedBuildInputs = with self; [ pycurl pkgs.koji GitPython pkgs.git pkgs.rpm pkgs.pyopenssl ]; @@ -18126,9 +18127,11 @@ let # # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; - # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 patchPhase = '' + # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py + # https://github.com/pypa/packaging/pull/36 + sed -i 's/version=VERSION/version=str(VERSION)/' setup.py ''; propagatedBuildInputs = with self; [ six argparse traceback2 ]; @@ -18204,7 +18207,7 @@ let name = "update_checker-0.11"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/u/update_checker/update_checker-0.11.tar.gz"; + url = "https://pypi.python.org/packages/source/u/update_checker/${name}.tar.gz"; md5 = "1daa54bac316be6624d7ee77373144bb"; }; From 960274fc7cae2a63ac876b82fbbe9193ace9ed65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 17 Nov 2015 11:39:09 +0100 Subject: [PATCH 018/157] wrapPython: use $out/bin also for $PATH (fixes pyramid pserve --reload) --- pkgs/development/python-modules/generic/wrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 557f79f865e..fa6a4d0102f 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -46,7 +46,7 @@ wrapPythonProgramsIn() { # (see pkgs/build-support/setup-hooks/make-wrapper.sh) local wrap_args="$f \ --prefix PYTHONPATH ':' $program_PYTHONPATH \ - --prefix PATH ':' $program_PATH" + --prefix PATH ':' $program_PATH:$dir/bin" # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. From f3092d6446986b9e72f356648d077dbdc98f6bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 11:44:37 +0100 Subject: [PATCH 019/157] buildPythonPackage: use a separate file to fire off setup.py --- .../python-modules/bootstrapped-pip/default.nix | 10 +++++++--- .../python-modules/generic/default.nix | 17 +++++++++-------- .../python-modules/generic/run_setup.py | 6 ++++++ 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/generic/run_setup.py diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 5578b3a83c4..67773627029 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -25,15 +25,19 @@ in stdenv.mkDerivation rec { unzip -d $out/${python.sitePackages} ${wheel_source} ''; - buildInputs = [ python makeWrapper unzip ]; - - installPhase = '' + patchPhase = '' mkdir -p $out/bin # patch pip to support "pip install --prefix" + # https://github.com/pypa/pip/pull/3252 pushd $out/${python.sitePackages}/ patch -p1 < ${./pip-7.0.1-prefix.patch} popd + ''; + + buildInputs = [ python makeWrapper unzip ]; + + installPhase = '' # install pip binary echo '${python.interpreter} -m pip "$@"' > $out/bin/pip diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 75115526a41..0a2fd429f00 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -50,7 +50,7 @@ then throw "${name} not supported for interpreter ${python.executable}" else let - setuppy = "import setuptools, tokenize;__file__='setup.py';exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))"; + setuppy = ./run_setup.py; in python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { inherit doCheck; @@ -75,18 +75,19 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { runHook postConfigure ''; - checkPhase = attrs.checkPhase or '' - runHook preCheck - ${python.interpreter} -c "${setuppy}" test - runHook postCheck - ''; - buildPhase = attrs.buildPhase or '' runHook preBuild - ${python.interpreter} -c "${setuppy}" bdist_wheel + cp ${setuppy} nix_run_setup.py + ${python.interpreter} nix_run_setup.py build_ext ${lib.concatStringsSep " " setupPyBuildFlags} bdist_wheel runHook postBuild ''; + checkPhase = attrs.checkPhase or '' + runHook preCheck + ${python.interpreter} nix_run_setup.py test + runHook postCheck + ''; + installPhase = attrs.installPhase or '' runHook preInstall diff --git a/pkgs/development/python-modules/generic/run_setup.py b/pkgs/development/python-modules/generic/run_setup.py new file mode 100644 index 00000000000..d980ac7d23d --- /dev/null +++ b/pkgs/development/python-modules/generic/run_setup.py @@ -0,0 +1,6 @@ +import setuptools +import tokenize + +__file__='setup.py'; + +exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec')) From f90023104201c03ee08061da8ab448a693d4ab71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 11:46:21 +0100 Subject: [PATCH 020/157] buildPythonPackage: fail if two packages with the same name are in closure --- .../python-modules/generic/default.nix | 4 +++ .../python-modules/generic/do_conflict.py | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/generic/do_conflict.py diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 0a2fd429f00..2927b3ab401 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -103,6 +103,10 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { postFixup = attrs.postFixup or '' wrapPythonPrograms + + # check if we have two packagegs with the same name in closure and fail + # this shouldn't happen, something went wrong with dependencies specs + python ${./do_conflict.py} ''; shellHook = attrs.shellHook or '' diff --git a/pkgs/development/python-modules/generic/do_conflict.py b/pkgs/development/python-modules/generic/do_conflict.py new file mode 100644 index 00000000000..412c15eac4b --- /dev/null +++ b/pkgs/development/python-modules/generic/do_conflict.py @@ -0,0 +1,29 @@ +import pkg_resources +import collections +import sys + +do_abort = False +packages = collections.defaultdict(list) + +for f in sys.path: + for req in pkg_resources.find_distributions(f): + if req not in packages[req.project_name]: + if req.project_name == 'setuptools': + continue + packages[req.project_name].append(req) + + +for name, duplicates in packages.iteritems(): + if len(duplicates) > 1: + do_abort = True + print("Found duplicated packages in closure for dependency '{}': ".format(name)) + for dup in duplicates: + print(" " + repr(dup)) + +if do_abort: + print("") + print( + 'Package duplicates found in closure, see above. Usually this ' + 'happens if two packages depend on different version ' + 'of the same dependency.') + sys.exit(1) From d0809c2925f418119e55fef477ad4b85c9e13c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 11:46:34 +0100 Subject: [PATCH 021/157] setuptools: cleanup expression --- .../python-modules/setuptools/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index dc1db1405db..082a16056fd 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wrapPython, distutils-cfg }: +{ stdenv, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { shortName = "setuptools-${version}"; @@ -11,23 +11,14 @@ stdenv.mkDerivation rec { sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509"; }; - buildInputs = [ python wrapPython distutils-cfg ]; - - buildPhase = "${python}/bin/${python.executable} setup.py build"; - - installPhase = - '' - dst=$out/lib/${python.libPrefix}/site-packages + buildInputs = [ python wrapPython ]; + doCheck = false; # requires pytest + installPhase = '' + dst=$out/${python.sitePackages} mkdir -p $dst export PYTHONPATH="$dst:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages + ${python.interpreter} setup.py install --prefix=$out wrapPythonPrograms - ''; - - doCheck = false; # requires pytest - - checkPhase = '' - ${python}/bin/${python.executable} setup.py test ''; meta = with stdenv.lib; { From 0ce117f058c47660f2386cdf85f31de6fdb60436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 11:48:13 +0100 Subject: [PATCH 022/157] pythonPackages: fix wheel build failures --- pkgs/top-level/python-packages.nix | 358 ++++++++++++++++++----------- 1 file changed, 224 insertions(+), 134 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9190ca6792..87110ac31dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -667,6 +667,7 @@ let }; doCheck = false; + propagatedBuildInputs = with self; [ dateutil ]; meta = { description = "Twitter API library"; @@ -1966,6 +1967,7 @@ let inherit md5; url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz"; }; + meta.broken = true; # https://bitbucket.org/pypa/setuptools/issues/462/pkg_resourcesfind_on_path-thinks-the }; zc_recipe_egg_buildout171 = self.zc_recipe_egg_fun { buildout = self.zc_buildout171; @@ -1974,8 +1976,8 @@ let }; zc_recipe_egg_buildout2 = self.zc_recipe_egg_fun { buildout = self.zc_buildout2; - version = "2.0.1"; - md5 = "5e81e9d4cc6200f5b1abcf7c653dd9e3"; + version = "2.0.3"; + md5 = "69a8ce276029390a36008150444aa0b4"; }; bunch = buildPythonPackage (rec { @@ -2755,6 +2757,46 @@ let }; }; + tablib = buildPythonPackage rec { + name = "tablib-${version}"; + version = "0.10.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/tablib/tablib-${version}.tar.gz"; + sha256 = "14wc8bmz60g35r6gsyhdzfvgfqpd3gw9lfkq49z5bxciykbxmhj1"; + }; + + buildInputs = with self; [ pytest ]; + + meta = with stdenv.lib; { + description = "Tablib: format-agnostic tabular dataset library"; + homepage = "http://python-tablib.org"; + }; + }; + + + cliff-tablib = buildPythonPackage rec { + name = "cliff-tablib-${version}"; + version = "1.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cliff-tablib/cliff-tablib-${version}.tar.gz"; + sha256 = "0fa1qw41lwda5ac3z822qhzbilp51y6p1wlp0h76vrvqcqgxi3ja"; + }; + + propagatedBuildInputs = with self; [ + argparse pyyaml pbr six cmd2 tablib unicodecsv prettytable stevedore pyparsing cliff + ]; + buildInputs = with self; [ + + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/dreamhost/cliff-tablib"; + }; + }; + + openstackclient = buildPythonPackage rec { name = "openstackclient-${version}"; version = "1.7.1"; @@ -2767,7 +2809,7 @@ let propagatedBuildInputs = with self; [ pbr six Babel cliff os-client-config oslo-config oslo-i18n oslo-utils glanceclient keystoneclient novaclient cinderclient neutronclient requests2 - stevedore + stevedore cliff-tablib ]; buildInputs = with self; [ requests-mock @@ -3785,14 +3827,14 @@ let dropbox = buildPythonPackage rec { name = "dropbox-${version}"; version = "3.37"; - doCheck = false; # python 2.7.9 does verify ssl certificates + #doCheck = false; # python 2.7.9 does verify ssl certificates src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dropbox/${name}.tar.gz"; sha256 = "f65c12bd97f09e29a951bc7cb30a74e005fc4b2f8bb48778796be3f73866b173"; }; - propagatedBuildInputs = with self; [ urllib3 mock setuptools ]; + propagatedBuildInputs = with self; [ requests2 urllib3 mock setuptools ]; meta = { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; @@ -3828,6 +3870,8 @@ let # Check is disabled because running them destroy the content of the local cluster! # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch doCheck = false; + propagatedBuildInputs = with self; [ urllib3 pyaml requests2 pyyaml ]; + buildInputs = with self; [ nosexcover mock ]; meta = { description = "Official low-level client for Elasticsearch"; @@ -4092,6 +4136,22 @@ let }; }; + functools32 = buildPythonPackage rec { + name = "functools32-${version}"; + version = "3.2.3-2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/functools32/functools32-${version}.tar.gz"; + sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn"; + }; + + + meta = with stdenv.lib; { + description = "This is a backport of the functools standard library module from"; + homepage = "https://github.com/MiCHiLU/python-functools32"; + }; + }; + gateone = buildPythonPackage rec { name = "gateone-1.2-0d57c3"; disabled = ! isPy27; @@ -4793,7 +4853,6 @@ let }; mailchimp = buildPythonPackage rec { - version = "2.0.9"; name = "mailchimp-${version}"; @@ -4802,13 +4861,11 @@ let sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770"; }; - # Test fails because specific version of docopt is searched - # (Possible fix: Needs upstream patching in the library) - doCheck = false; - buildInputs = with self; [ docopt ]; - propagatedBuildInputs = with self; [ requests ]; + patchPhase = '' + sed -i 's/==/>=/' setup.py + ''; meta = { description = "A CLI client and Python API library for the MailChimp email platform"; @@ -5646,6 +5703,21 @@ let }; }; + multi_key_dict = buildPythonPackage rec { + name = "multi_key_dict-${version}"; + version = "2.0.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/multi_key_dict/multi_key_dict-${version}.tar.gz"; + sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy"; + }; + + meta = with stdenv.lib; { + description = "multi_key_dict"; + homepage = "https://github.com/formiaczek/multi_key_dict"; + }; + }; + pyramid_zodbconn = buildPythonPackage rec { name = "pyramid_zodbconn-0.7"; @@ -5657,8 +5729,8 @@ let # should be fixed in next release doCheck = false; - buildInputs = with self; [ pyramid mock ]; - propagatedBuildInputs = with self; [ zodb zodburi ]; + buildInputs = with self; [ mock ]; + propagatedBuildInputs = with self; [ pyramid zodb zodburi ZEO ]; meta = { maintainers = with maintainers; [ iElectric ]; @@ -6211,51 +6283,6 @@ let }; }; - django_1_4 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.4.22"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; - sha256 = "110p1mgdcf87kyr64mr2jgmyapyg27kha74yq3wjrazwfbbwkqnh"; - }; - - # error: invalid command 'test' - doCheck = false; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - - django_1_3 = buildPythonPackage rec { - name = "Django-1.3.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; - sha256 = "12pv8y2x3fhrcrjayfm6z40r57iwchfi5r19ajs8q8z78i3z8l7f"; - }; - - # error: invalid command 'test' - doCheck = false; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - django_appconf = buildPythonPackage rec { name = "django-appconf-${version}"; version = "1.0.1"; @@ -6323,7 +6350,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ django_1_3 ]; + propagatedBuildInputs = with self; [ django_1_5 ]; meta = { description = "A generic tagging application for Django projects"; @@ -6532,7 +6559,7 @@ let sha256 = "1yf0dnkj00yzzhbssw88j9gr58ngjfrd6r68p9asf6djishj9h45"; }; - propagatedBuildInputs = with self; [ pil django_1_3 feedparser ]; + propagatedBuildInputs = with self; [ pil django_1_5 feedparser ]; meta = { description = "A collection of useful extensions for Django"; @@ -6881,27 +6908,26 @@ let }; docker_compose = buildPythonPackage rec { - version = "1.4.2"; + version = "1.5.1"; name = "docker-compose-${version}"; namePrefix = ""; disabled = isPy3k || isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-compose/${name}.tar.gz"; - sha256 = "4f5dae7685b60b70d5adc66a8572e08a97d45f26e279897d70e539277b5d9331"; + sha256 = "0mdgpwkpss48zz36sw65crqjry87ba5p3mkl6ncbb8jqsxgqhpnz"; }; - propagatedBuildInputs = with self; [ - six requests pyyaml texttable docopt docker dockerpty websocket_client - (requests2.override { - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/r/requests/requests-2.6.1.tar.gz"; - md5 = "da6e487f89e6a531699b7fd97ff182af"; - }; - }) - ]; - + # lots of networking and other fails doCheck = false; + buildInputs = with self; [ mock pytest nose ]; + propagatedBuildInputs = with self; [ + requests2 six pyyaml texttable docopt docker dockerpty websocket_client + enum34 jsonschema + ]; + patchPhase = '' + sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py + ''; meta = { homepage = "https://docs.docker.com/compose/"; @@ -7150,15 +7176,16 @@ let }; jsonschema = buildPythonPackage (rec { - version = "2.4.0"; + version = "2.5.1"; name = "jsonschema-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-${version}.tar.gz"; - md5 = "661f85c3d23094afbb9ac3c0673840bf"; + sha256 = "0hddbqjm4jq63y8jf44nswina1crjs16l9snb6m3vvgyg31klrrn"; }; - buildInputs = with self; [ nose mock ]; + buildInputs = with self; [ nose mock vcversioner ]; + propagatedBuildInputs = with self; [ functools32 ]; patchPhase = '' substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}" @@ -7176,6 +7203,20 @@ let }; }); + vcversioner = buildPythonPackage rec { + name = "vcversioner-${version}"; + version = "2.14.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/v/vcversioner/vcversioner-${version}.tar.gz"; + sha256 = "11ivq1bm7v0yb4nsfbv9m7g7lyjn112gbvpjnjz8nv1fx633dm5c"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/habnabit/vcversioner"; + }; + }; + falcon = buildPythonPackage (rec { name = "falcon-0.3.0"; @@ -7277,6 +7318,8 @@ let sha256 = "144f4yn2nvnxh2vrnmiabpwx3s637np0d1j1w95zym790d66shir"; }; + propagatedBuildInputs = [ self.six ]; + meta = { description = "Filesystem abstraction"; homepage = http://pypi.python.org/pypi/fs; @@ -7284,9 +7327,6 @@ let maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; - - # Fails: "error: invalid command 'test'" - doCheck = false; }; fuse = buildPythonPackage (rec { @@ -8787,15 +8827,18 @@ let }); - limnoria = buildPythonPackage (rec { - name = "limnoria-20130327"; + limnoria = buildPythonPackage rec { + name = "limnoria-${version}"; + version = "2015.10.04"; src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-06-01T10:32:51+0200.tar.gz; - name = "limnoria-2013-06-01.tar.gz"; - sha256 = "1i8q9zzf43sr3n1q4h6h1z8nz31g4aa8dq94ywvfbh7hklmchq6n"; + url = "https://pypi.python.org/packages/source/l/limnoria/${name}.tar.gz"; + sha256 = "1hwwwr0z2vsirgwd92z17nbhnhsz0m25bpxn5sanqlbcjbwhyk9z"; }; + patchPhase = '' + sed -i 's/version=version/version="${version}"/' setup.py + ''; buildInputs = with self; [ pkgs.git ]; propagatedBuildInputs = with self; [ modules.sqlite3 ]; @@ -8807,7 +8850,7 @@ let license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; }; - }); + }; linode = buildPythonPackage rec { @@ -8931,6 +8974,26 @@ let propagatedBuildInputs = with self; [ unittest2 six ]; }; + logilab-constraint = buildPythonPackage rec { + name = "logilab-constraint-${version}"; + version = "0.6.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/l/logilab-constraint/${name}.tar.gz"; + sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg"; + }; + + propagatedBuildInputs = with self; [ + logilab_common six + ]; + + meta = with stdenv.lib; { + description = "logilab-database provides some classes to make unified access to different"; + homepage = "http://www.logilab.org/project/logilab-database"; + }; + }; + + lxml = buildPythonPackage ( rec { name = "lxml-3.3.6"; @@ -10494,7 +10557,7 @@ let inherit (support) preBuild checkPhase; - setupPyBuildFlags = ["--fcompiler='gnu95'"]; + setupPyBuildFlags = ["-i" "--fcompiler='gnu95'"]; buildInputs = [ pkgs.gfortran self.nose ]; propagatedBuildInputs = [ support.openblas ]; @@ -11208,7 +11271,7 @@ let }; propagatedBuildInputs = with self; [ - six Babel simplejson requests keystoneclient prettytable argparse pbr + six Babel simplejson requests2 keystoneclient prettytable argparse pbr ]; buildInputs = with self; [ testrepository requests-mock @@ -12814,15 +12877,15 @@ let python-jenkins = buildPythonPackage rec { name = "python-jenkins-${version}"; - version = "0.4.5"; + version = "0.4.11"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-jenkins/${name}.tar.gz"; - md5 = "10f1c24d45afe9cadd43f8d60b37d04c"; + sha256 = "153gm7pmmn0bymglsgcr2ya0752r2v1hajkx73gl1pk4jifb2gdf"; }; - buildInputs = with self; [ pbr pip ]; - pythonPath = with self; [ pyyaml six ]; - doCheck = false; + buildInputs = with self; [ mock ]; + propagatedBuildInputs = with self; [ pbr pyyaml six multi_key_dict testtools + testscenarios testrepository ]; meta = { description = "Python bindings for the remote Jenkins API"; @@ -13817,6 +13880,8 @@ let # Tests require a local instance of elasticsearch doCheck = false; + propagatedBuildInputs = with self; [ elasticsearch six simplejson certifi ]; + buildInputs = with self; [ nose mock ]; meta = { description = "A clean, future-proof, high-scale API to elasticsearch."; @@ -15524,7 +15589,7 @@ let }; propagatedBuildInputs = with self; - [ django_1_3 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments + [ django_1_5 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments djblets django_evolution pycrypto modules.sqlite3 pysvn pil psycopg2 ]; @@ -15542,7 +15607,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ isodate ]; + propagatedBuildInputs = with self; [ isodate html5lib ]; meta = { description = "A Python library for working with RDF, a simple yet powerful language for representing information"; @@ -16161,10 +16226,6 @@ let buildInputs = with self; [ pip ]; - preBuild = '' - ${python.interpreter} setup.py egg_info - ''; - meta = with stdenv.lib; { homepage = https://bitbucket.org/pypa/setuptools_scm/; description = "Handles managing your python package versions in scm metadata"; @@ -16173,23 +16234,27 @@ let }; }; - setuptoolsDarcs = buildPythonPackage { - name = "setuptools-darcs-1.2.9"; + setuptoolsDarcs = buildPythonPackage rec { + name = "setuptools_darcs-${version}"; + version = "1.2.11"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.9.tar.gz"; - sha256 = "d37ce11030addbd729284c441facd0869cdc6e5c888dc5fa0a6f1edfe3c3e617"; + url = "http://pypi.python.org/packages/source/s/setuptools_darcs/${name}.tar.gz"; + sha256 = "1wsh0g1fn10msqk87l5jrvzs0yj5mp6q9ld3gghz6zrhl9kqzdn1"; }; # In order to break the dependency on darcs -> ghc, we don't add # darcs as a propagated build input. propagatedBuildInputs = with self; [ darcsver ]; + # ugly hack to specify version that should otherwise come from darcs + patchPhase = '' + substituteInPlace setup.py --replace "name=PKG" "name=PKG, version='${version}'" + ''; + meta = { - description = "setuptools plugin for the Darcs version control system"; - + description = "Setuptools plugin for the Darcs version control system"; homepage = http://allmydata.org/trac/setuptools_darcs; - license = "BSD"; }; }; @@ -16839,19 +16904,14 @@ let buildInputs = [ pkgs.bash ]; - doCheck = !isPyPy; - preConfigure = '' substituteInPlace test_subprocess32.py \ --replace '/usr/' '${pkgs.bash}/' ''; - checkPhase = '' - TMP_PREFIX=`pwd`/tmp/$name - TMP_INSTALL_DIR=$TMP_PREFIX/lib/${pythonPackages.python.libPrefix}/site-packages - PYTHONPATH="$TMP_INSTALL_DIR:$PYTHONPATH" - mkdir -p $TMP_INSTALL_DIR - python setup.py develop --prefix $TMP_PREFIX + doInstallCheck = !isPyPy; + doCheck = false; + installCheckPhase = '' python test_subprocess32.py ''; @@ -17737,11 +17797,11 @@ let }; texttable = self.buildPythonPackage rec { - name = "texttable-0.8.1"; + name = "texttable-0.8.4"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/texttable/${name}.tar.gz"; - md5 = "4fe37704f16ecf424b91e122defedd7e"; + sha256 = "0bkhs4dx9s6g7fpb969hygq56hyz4ncfamlynw72s0n6nqfbd1w5"; }; meta = { @@ -18816,18 +18876,15 @@ let # Tests require `pyutil' so disable them to avoid circular references. doCheck = false; - buildInputs = with self; [ setuptoolsDarcs ]; + propagatedBuildInputs = with self; [ setuptoolsDarcs ]; meta = { description = "zbase32, a base32 encoder/decoder"; - homepage = http://pypi.python.org/pypi/zbase32; - license = "BSD"; }; }); - zconfig = buildPythonPackage rec { name = "zconfig-${version}"; version = "3.0.3"; @@ -19487,18 +19544,18 @@ let }; hgsvn = buildPythonPackage rec { - name = "hgsvn-0.3.5"; + name = "hgsvn-0.3.11"; src = pkgs.fetchurl rec { - url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.zip"; - sha256 = "043yvkjf9hgm0xzhmwj1qk3fsmbgwm39f4wsqkscib9wfvxs8wbg"; + url = "https://pypi.python.org/packages/source/h/hgsvn/${name}-hotfix.zip"; + sha256 = "0yvhwdh8xx8rvaqd3pnnyb99hfa0zjdciadlc933p27hp9rf880p"; }; disabled = isPy3k || isPyPy; + doCheck = false; # too many assumptions - buildInputs = with self; [ pkgs.setuptools ]; - doCheck = false; + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ hglib ]; - meta = { - description = "HgSVN"; + meta = { homepage = http://pypi.python.org/pypi/hgsvn; }; }; @@ -19712,18 +19769,29 @@ let }; doCheck = false; + buildInputs = [ self.testfixtures ]; propagatedBuildInputs = with self; [ cornice mozsvc pybrowserid tokenlib ]; - patchPhase = '' - sed -i "s|'testfixtures'||" setup.py - ''; - meta = { - maintainers = [ ]; platforms = platforms.all; }; }; + testfixtures = buildPythonPackage rec { + name = "testfixtures-${version}"; + version = "4.5.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/testfixtures/testfixtures-${version}.tar.gz"; + sha256 = "0my8zq9d27mc7j78pz9971cn5wz6zi4vxlqa50szr2vq9j2xxkll"; + }; + + + meta = with stdenv.lib; { + homepage = "https://github.com/Simplistix/testfixtures"; + }; + }; + tissue = buildPythonPackage rec { name = "tissue-0.9.2"; src = pkgs.fetchurl { @@ -20041,7 +20109,7 @@ let md5 = "8edbb61f1ffe11c181bd2cb9ec977c72"; }; - propagatedBuildInputs = with self; [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ @@ -20721,7 +20789,8 @@ let serversyncstorage = buildPythonPackage rec { name = "serversyncstorage-${version}"; version = "1.5.11"; - disabled = ! isPy27; + disabled = !isPy27; + src = pkgs.fetchgit { url = https://github.com/mozilla-services/server-syncstorage.git; rev = "refs/tags/${version}"; @@ -20730,13 +20799,34 @@ let propagatedBuildInputs = with self; [ pyramid sqlalchemy9 simplejson mozsvc cornice pyramid_hawkauth pymysql - pymysqlsa umemcache wsgiproxy2 requests pybrowserid + pymysqlsa umemcache WSGIProxy requests pybrowserid + ]; + buildInputs = with self; [ testfixtures unittest2 ]; + + #doCheck = false; # lazy packager + }; + + WSGIProxy = buildPythonPackage rec { + name = "WSGIProxy-${version}"; + version = "0.2.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/W/WSGIProxy/WSGIProxy-${version}.tar.gz"; + sha256 = "0wqz1q8cvb81a37gb4kkxxpv4w7k8192a08qzyz67rn68ln2wcig"; + }; + + propagatedBuildInputs = with self; [ + paste six ]; - doCheck = false; # lazy packager + meta = with stdenv.lib; { + description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other"; + homepage = "http://pythonpaste.org/wsgiproxy/"; + }; }; + thumbor = buildPythonPackage rec { name = "thumbor-${version}"; version = "5.2.1"; From 481a9ada06b28e0ae1ce2a014a00d37f010e13f6 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 3 Nov 2015 05:21:44 +0100 Subject: [PATCH 023/157] pypy: 2.6.0 -> 4.0.0 --- pkgs/development/interpreters/pypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index e82b4236325..f4d322c71bb 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.6"; + majorVersion = "4.0"; version = "${majorVersion}.0"; libPrefix = "pypy${majorVersion}"; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; - sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh"; + sha256 = "008a7mxyw95asiz678v09p345v7pfchq6aa3x96fn7lkzhir67z7"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ] From 42acb5dc55a754ef074cb13e2386886a2a99c483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 12:39:43 +0100 Subject: [PATCH 024/157] buildPythonPackage: fix pypy --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 2927b3ab401..cb2d67c61eb 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -106,7 +106,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { # check if we have two packagegs with the same name in closure and fail # this shouldn't happen, something went wrong with dependencies specs - python ${./do_conflict.py} + ${python.interpreter} ${./do_conflict.py} ''; shellHook = attrs.shellHook or '' From 4f19853b3073b8c453353b3680e8e9add5f18ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 17:23:48 +0100 Subject: [PATCH 025/157] buildPythonPackage: inline bootstrapped-pip --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87110ac31dd..9a5e06ee5f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15,7 +15,9 @@ let callPackage = pkgs.newScope self; - buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { }); + buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { + bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; + }); # Unique python version identifier pythonName = @@ -126,8 +128,6 @@ let mpi = pkgs.openmpi; }; - bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; - nixpart = callPackage ../tools/filesystems/nixpart { }; # This is used for NixOps to make sure we won't break it with the next major From ec0f58b459d176b39dadf4fc22727bbc6bea298c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 17:55:58 +0100 Subject: [PATCH 026/157] pythonPackages.clint: fix build --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a5e06ee5f8..4542470a08b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16601,10 +16601,11 @@ let }; checkPhase = '' - nosetests + ${python.interpreter} test_clint.py ''; - buildInputs = with self; [ pillow nose_progressive nose mock blessings nose ]; + buildInputs = with self; [ mock blessings nose nose_progressive ]; + propagatedBuildInputs = with self; [ pillow blessings args ]; meta = { maintainers = with maintainers; [ iElectric ]; From a912c45ee2a3560d0cffe0ac10dd07ae1000ac1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 17:56:26 +0100 Subject: [PATCH 027/157] buildPythonPackage: get rid of setupPyInstallFlags since there is no such thing --- doc/language-support.xml | 7 ------- pkgs/applications/office/zim/default.nix | 4 ++-- pkgs/development/python-modules/generic/default.nix | 2 +- pkgs/development/python-modules/tables/default.nix | 1 - pkgs/tools/virtualization/cloud-init/default.nix | 4 ++-- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 0a0e24e9abf..b4f3276265a 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -382,13 +382,6 @@ twisted = buildPythonPackage { - - setupPyInstallFlags - - List of flags passed to setup.py install command. - - - setupPyBuildFlags diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 84a5680b1f4..96749c665b6 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { export HOME="/tmp/home" ''; - setupPyInstallFlags = ["--skip-xdg-cmd"]; + setupPyBuildFlags = ["--skip-xdg-cmd"]; # # Exactly identical to buildPythonPackage's version but for the @@ -57,7 +57,7 @@ buildPythonPackage rec { ${python}/bin/${python.executable} setup.py install \ --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} + --prefix="$out" ${lib.concatStringsSep " " setupPyBuildFlags} eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth if [ -e "$eapth" ]; then diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index cb2d67c61eb..acdcc7233cd 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -95,7 +95,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" pushd dist - ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out + ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache popd runHook postInstall diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index f1551f41ae5..3dcf00e9b8c 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -20,7 +20,6 @@ buildPythonPackage rec { "--lzo=${lzo}" "--bzip2=${bzip2}" ]; - setupPyInstallFlags = setupPyBuildFlags; # Run the test suite. # It requires the build path to be in the python search path. diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 48eb68242e1..acdeda81298 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -3,7 +3,7 @@ let version = "0.7.6"; in pythonPackages.buildPythonPackage rec { - name = "cloud-init-0.7.6"; + name = "cloud-init-${version}"; namePrefix = ""; src = fetchurl { @@ -23,7 +23,7 @@ in pythonPackages.buildPythonPackage rec { pythonPath = with pythonPackages; [ cheetah jinja2 prettytable oauth pyserial configobj pyyaml argparse requests jsonpatch ]; - setupPyInstallFlags = ["--init-system systemd"]; + # TODO: --init-system systemd meta = { homepage = http://cloudinit.readthedocs.org; From 7d8a6c6a423cad4d5352eb1db0eb591e8e1d95a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 18:31:01 +0100 Subject: [PATCH 028/157] rewrite release-python.nix to reflect reality --- pkgs/top-level/release-python.nix | 67 ++++--------------------------- 1 file changed, 8 insertions(+), 59 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index a7d3194cdbb..029ea7c9d4c 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1,70 +1,19 @@ /* test for example like this - $ nix-build pkgs/top-level/release-python.nix + $ hydra-eval-jobs pkgs/top-level/release-python.nix */ { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ] + supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] }: with import ./release-lib.nix {inherit supportedSystems; }; -let - jobsForDerivations = attrset: pkgs.lib.attrsets.listToAttrs - (map - (name: { inherit name; - value = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };}) - (builtins.attrNames - (pkgs.lib.attrsets.filterAttrs - (n: v: (v.type or null) == "derivation") - attrset))); - - - jobs = - { - - # } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec { - - } // (mapTestOn rec { - - offlineimap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pycairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pycrypto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pycups = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pydb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyexiv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pygame = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pygobject = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pygtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pygtksourceview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyGtkGlade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyIRCt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyMAILt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyopenssl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyqt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyrex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyrex096 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyside = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pysideApiextractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pysideGeneratorrunner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pysideShiboken = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pysideTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pystringtemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python26 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python27 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python26Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python27Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python26Packages = jobsForDerivations pkgs.python26Packages; - python27Packages = jobsForDerivations pkgs.python27Packages; - python3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pythonDBus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pythonIRClib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pythonmagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pythonSexy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; -}); - -in jobs +(mapTestOn { + pypyPackages = packagePlatforms pkgs.pypyPackages; + pythonPackages = packagePlatforms pkgs.pythonPackages; + python34Packages = packagePlatforms pkgs.python34Packages; + python33Packages = packagePlatforms pkgs.python33Packages; +}) From 1029db9024a501b6653d3ddaf4007f5497820d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 19:03:05 +0100 Subject: [PATCH 029/157] buildPythonPackage: fix do_conflict.py on python 3 --- pkgs/development/python-modules/generic/do_conflict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/do_conflict.py b/pkgs/development/python-modules/generic/do_conflict.py index 412c15eac4b..092bba4df23 100644 --- a/pkgs/development/python-modules/generic/do_conflict.py +++ b/pkgs/development/python-modules/generic/do_conflict.py @@ -13,7 +13,7 @@ for f in sys.path: packages[req.project_name].append(req) -for name, duplicates in packages.iteritems(): +for name, duplicates in packages.items(): if len(duplicates) > 1: do_abort = True print("Found duplicated packages in closure for dependency '{}': ".format(name)) From dfee078df48cbdf7a8b6a3dc03e704dbef3ffb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 23:58:34 +0100 Subject: [PATCH 030/157] buildPythonPackage: more wheel build fixes --- pkgs/top-level/python-packages.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4542470a08b..da07409e376 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2955,7 +2955,7 @@ let }; }; - cffi_0_8 = buildPythonPackage rec { + cffi_0_8 = if isPyPy then null else buildPythonPackage rec { name = "cffi-0.8.6"; src = pkgs.fetchurl { @@ -2970,7 +2970,7 @@ let }; }; - cffi = buildPythonPackage rec { + cffi = if isPyPy then null else buildPythonPackage rec { name = "cffi-1.3.0"; src = pkgs.fetchurl { @@ -4086,7 +4086,7 @@ let meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { - url = "https://fedorahosted.org/releases/f/e/fedpkg/fedpkg-1.14.tar.bz2"; + url = "https://fedorahosted.org/releases/f/e/fedpkg/${name}.tar.bz2"; sha256 = "0rj60525f2sv34g5llafnkmpvbwrfbmfajxjc14ldwzymp8clc02"; }; @@ -9320,10 +9320,7 @@ let doCheck = false; # sed calls will be unecessary in v3.1.11+ preConfigure = '' - sed -i 's/future == 0.9.0/future>=0.9.0/' setup.py - sed -i 's/tzlocal == 1.0/tzlocal>=1.0/' setup.py - sed -i 's/pep8==1.4.1/pep8>=1.4.1/' setup.py - sed -i 's/pyflakes==0.6.1/pyflakes>=0.6.1/' setup.py + sed -i 's/==/>=/' setup.py export LC_ALL="en_US.UTF-8" ''; @@ -10718,7 +10715,7 @@ let sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; }; - propagatedBuildInputs = with pythonPackages; [ httplib2 pyasn1 pyasn1-modules rsa ]; + propagatedBuildInputs = with pythonPackages; [ six httplib2 pyasn1 pyasn1-modules rsa ]; doCheck = false; meta = { @@ -14510,7 +14507,8 @@ let url = "https://pypi.python.org/packages/source/p/python-fedora/${name}.tar.gz"; sha256 = "15m8lvbb5q4rg508i4ah8my872qrq5xjwgcgca4d3kzjv2x6fhim"; }; - propagatedBuildInputs = with self; [ kitchen requests bunch paver ]; + propagatedBuildInputs = with self; [ kitchen requests bunch paver six munch urllib3 + beautifulsoup4 ]; doCheck = false; # https://github.com/fedora-infra/python-fedora/issues/140 @@ -17471,14 +17469,15 @@ let disabled = isPy3k; - propagatedBuildInputs = with self; [ pkgs.syncthing pygobject3 dateutil pkgs.gtk3 pyinotify pkgs.libnotify pkgs.psmisc ]; + propagatedBuildInputs = with self; [ pkgs.syncthing dateutil pyinotify pkgs.libnotify pkgs.psmisc + pygobject3 pkgs.gtk3 ]; patchPhase = '' substituteInPlace "scripts/syncthing-gtk" \ - --replace "/usr/share" "$out/share" \ + --replace "/usr/share" "$out/share" + substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" ''; - meta = { description = " GTK3 & python based GUI for Syncthing "; maintainers = with maintainers; [ DamienCassou ]; From 6ba529277a7f3d07a8182d94205197fbb256b144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 09:56:11 +0100 Subject: [PATCH 031/157] buildPythonPackage: catch_conflicts should ignore pip --- .../generic/{do_conflict.py => catch_conflicts.py} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/python-modules/generic/{do_conflict.py => catch_conflicts.py} (87%) diff --git a/pkgs/development/python-modules/generic/do_conflict.py b/pkgs/development/python-modules/generic/catch_conflicts.py similarity index 87% rename from pkgs/development/python-modules/generic/do_conflict.py rename to pkgs/development/python-modules/generic/catch_conflicts.py index 092bba4df23..35512bb44d3 100644 --- a/pkgs/development/python-modules/generic/do_conflict.py +++ b/pkgs/development/python-modules/generic/catch_conflicts.py @@ -8,7 +8,8 @@ packages = collections.defaultdict(list) for f in sys.path: for req in pkg_resources.find_distributions(f): if req not in packages[req.project_name]: - if req.project_name == 'setuptools': + # some exceptions inside buildPythonPackage + if req.project_name in ['setuptools', 'pip']: continue packages[req.project_name].append(req) From 127a20f8da1b6ff50fcc273edee1570bf5eff428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 09:56:46 +0100 Subject: [PATCH 032/157] buildPythonPackage: sadly, checkPhase is too often installPhase in python --- .../python-modules/generic/default.nix | 17 +++++++------ pkgs/top-level/python-packages.nix | 25 +++++-------------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index acdcc7233cd..d820e0f30ac 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,7 +53,6 @@ let setuppy = ./run_setup.py; in python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { - inherit doCheck; name = namePrefix + name; @@ -82,12 +81,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { runHook postBuild ''; - checkPhase = attrs.checkPhase or '' - runHook preCheck - ${python.interpreter} nix_run_setup.py test - runHook postCheck - ''; - installPhase = attrs.installPhase or '' runHook preInstall @@ -101,12 +94,20 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { runHook postInstall ''; + doInstallCheck = doCheck; + doCheck = false; + installCheckPhase = attrs.checkPhase or '' + runHook preCheck + ${python.interpreter} nix_run_setup.py test + runHook postCheck + ''; + postFixup = attrs.postFixup or '' wrapPythonPrograms # check if we have two packagegs with the same name in closure and fail # this shouldn't happen, something went wrong with dependencies specs - ${python.interpreter} ${./do_conflict.py} + ${python.interpreter} ${./catch_conflicts.py} ''; shellHook = attrs.shellHook or '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da07409e376..2d1d10060a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10988,10 +10988,7 @@ let sed -i 's@python@${python.interpreter}@' os_testr/tests/files/testr-conf ''; - # since tests depend on install results, let's do it so - doInstallCheck = true; - doCheck = false; - installCheckPhase = '' + checkPhase = '' export PATH=$PATH:$out/bin ${python.interpreter} setup.py test ''; @@ -11560,9 +11557,7 @@ let sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900"; }; - doInstallCheck = true; - doCheck = false; - installCheckPhase = '' + checkPhase = '' # remove turbogears tests as we don't have it packaged rm tests/test_tg* # remove flask since we don't have flask-restful @@ -11604,9 +11599,7 @@ let rm taskflow/tests/unit/test_engines.py ''; - doInstallCheck = true; - doCheck = false; - installCheckPhase = '' + checkPhase = '' sed -i '/doc8/d' test-requirements.txt ${python.interpreter} setup.py test ''; @@ -15998,9 +15991,7 @@ let sha256 = "05qf0m32isflln1zjgxlpw0wf469lj86vdwwqyizp1h94x5l22ji"; }; - doInstallCheck = true; - doCheck = false; - installCheckPhase = '' + checkPhase = '' # this test takes too long sed -i 's/test_big_file/noop/' test/test_sendfile.py ${self.python.executable} test/test_sendfile.py @@ -16908,9 +16899,7 @@ let --replace '/usr/' '${pkgs.bash}/' ''; - doInstallCheck = !isPyPy; - doCheck = false; - installCheckPhase = '' + checkPhase = '' python test_subprocess32.py ''; @@ -17149,9 +17138,7 @@ let buildInputs = with self; [ unittest2 scripttest pytz pkgs.pylint tempest-lib mock testtools ]; propagatedBuildInputs = with self; [ pbr tempita decorator sqlalchemy_1_0 six sqlparse ]; - doInstallCheck = true; - doCheck = false; - installCheckPhase = '' + checkPhase = '' export PATH=$PATH:$out/bin echo sqlite:///__tmp__ > test_db.cfg # depends on ibm_db_sa From d202585b4c2fe3253d11dfdd8968ff1d98493ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 09:59:31 +0100 Subject: [PATCH 033/157] buildPythonPackage: fix more wheels failures --- pkgs/top-level/python-packages.nix | 64 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d1d10060a0..e60ca1c95bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -368,7 +368,7 @@ let self.pyramid_jinja2 self.pyramid_tm self.pytz - self.sqlalchemy + self.sqlalchemy8 self.transaction self.waitress self.webhelpers @@ -1123,7 +1123,7 @@ let }; buildInputs = with self; [ pkgs.btrfsProgs ]; - propagatedBuildInputs = with self; [ contextlib2 sqlalchemy9 pyxdg pycparser alembic ] + propagatedBuildInputs = with self; [ contextlib2 pyxdg pycparser alembic ] ++ optionals (!isPyPy) [ cffi ]; meta = { @@ -2204,6 +2204,12 @@ let sha256 = "04lqd2i4fjs606b0q075yi9xksk567m0sfph6v6j80za0hvzqyy5"; }; + patchPhase = '' + sed -i 's/==/>=/' requirements.txt + ''; + + propagatedBuildInputs = with self; [ docopt requests2 pygments ]; + # Error when running tests: # No local packages or download links found for requests doCheck = false; @@ -3807,6 +3813,7 @@ let checkPhase = '' # Not worth the trouble rm test/with_dummyserver/test_proxy_poolmanager.py + rm test/with_dummyserver/test_socketlevel.py # pypy: https://github.com/shazow/urllib3/issues/736 rm test/with_dummyserver/test_connectionpool.py @@ -9678,11 +9685,11 @@ let msrplib = buildPythonPackage rec { name = "python-msrplib-${version}"; - version = "0.17.0"; + version = "0.18.0"; src = pkgs.fetchurl { url = "http://download.ag-projects.com/MSRP/${name}.tar.gz"; - sha256 = "fe6ee541fbb4380a5708d08f378724dbc93438ff35c0cd0400e31b070fce73c4"; + sha256 = "0vp9g5p015g3f67rl4vz0qnn6x7hciry6nmvwf82h9h5rx11r43j"; }; propagatedBuildInputs = with self; [ eventlib application gnutls ]; @@ -10757,6 +10764,10 @@ let sha256 = "16jb8x5hbs3g4dq10y6rqc1005bnffwnlws8x7j1d96n7k9mjn8h"; }; + patchPhase = '' + substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'" + ''; + propagatedBuildInputs = with self; [ pyptlib argparse twisted pycrypto pyyaml ]; @@ -10917,7 +10928,7 @@ let disabled = isPy3k; src = pkgs.fetchgit { - url = git://gitorious.org/opensuse/osc.git; + url = https://github.com/openSUSE/osc; rev = "6cd541967ee2fca0b89e81470f18b97a3ffc23ce"; sha256 = "a39ce0e321e40e9758bf7b9128d316c71b35b80eabc84f13df492083bb6f1cc6"; }; @@ -12898,22 +12909,21 @@ let disabled = isPy3k; - postInstall = "ln -s $out/lib/${python.libPrefix}/site-packages $out/lib/${python.libPrefix}/site-packages/PIL"; + postInstall = "ln -s $out/${python.sitePackages} $out/${python.sitePackages}/PIL"; preConfigure = '' sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;' - '' - # Remove impurities - + stdenv.lib.optionalString stdenv.isDarwin '' + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # Remove impurities substituteInPlace setup.py \ --replace '"/Library/Frameworks",' "" \ --replace '"/System/Library/Frameworks"' "" ''; - checkPhase = "${python}/bin/${python.executable} selftest.py"; + checkPhase = "${python.interpreter} selftest.py"; meta = { homepage = http://www.pythonware.com/products/pil/; @@ -13617,17 +13627,6 @@ let --replace '"/usr/lib"' '"${pkgs.binutils}/lib"' ''; - # --old-and-unmanageable not supported by this setup.py - installPhase = '' - mkdir -p "$out/lib/${python.libPrefix}/site-packages" - - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --prefix="$out" - ''; - meta = { homepage = https://github.com/Groundworkstech/pybfd; description = "A Python interface to the GNU Binary File Descriptor (BFD) library"; @@ -14239,8 +14238,7 @@ let propagatedBuildInputs = with self; [ urlgrabber ]; checkPhase = '' - export PYTHONPATH="$PYTHONPATH:." - ${python}/bin/${python.executable} tests/baseclass.py -vv + ${python.interpreter} tests/baseclass.py -vv ''; meta = { @@ -14785,6 +14783,8 @@ let sha256 = "0hvim60bhgfj91m7pp8jfmb49f087xqlgkqa505zw28r7yl0hcfp"; }; + propagatedBuildInputs = with self; [ requests2 ]; + meta = { homepage = "https://github.com/rackspace/pyrax"; license = licenses.mit; @@ -16749,19 +16749,14 @@ let version = "2.5.1"; disabled = isPy3k; - configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile"; - src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; sha256 = "0vpy2vss8667c0kp1k8vybl38nxp7kr2v2wa8sngrgzd65m6ww5p"; }; propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ]; - buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite libvpx ]; - installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out"; - doCheck = false; }; @@ -21405,17 +21400,18 @@ let }; jenkins-job-builder = buildPythonPackage rec { - name = "jenkins-job-builder-1.2.0"; + name = "jenkins-job-builder-1.3.0"; disabled = ! (isPy26 || isPy27); src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jenkins-job-builder/${name}.tar.gz"; - md5 = "79e44ef0d3fffc19f415d8c0caac6b7b"; + sha256 = "111vpf6hzzb2mcdqi0a9r1dkf28ln9w6sgfqri0qxwf1ffbdqx6x"; }; - # pbr required for jenkins-job-builder is <1.0.0 while many of the test - # dependencies require pbr>=1.1 - doCheck = false; + patchPhase = '' + sed -i '/ordereddict/d' requirements.txt + export HOME=$TMPDIR + ''; buildInputs = with self; [ pip @@ -21423,10 +21419,12 @@ let propagatedBuildInputs = with self; [ pbr + mock python-jenkins pyyaml six ] ++ optionals isPy26 [ + ordereddict argparse ordereddict ]; From 2ebaf14eba37a21c1e9dc4d112e5ab49cd55f44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 09:59:56 +0100 Subject: [PATCH 034/157] release-python.nix: drop darwin and i686-linux, add py35 --- pkgs/top-level/release-python.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 029ea7c9d4c..1c654272bb8 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -6,7 +6,7 @@ { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] + supportedSystems ? [ "x86_64-linux" ] }: with import ./release-lib.nix {inherit supportedSystems; }; @@ -14,6 +14,7 @@ with import ./release-lib.nix {inherit supportedSystems; }; (mapTestOn { pypyPackages = packagePlatforms pkgs.pypyPackages; pythonPackages = packagePlatforms pkgs.pythonPackages; - python34Packages = packagePlatforms pkgs.python34Packages; python33Packages = packagePlatforms pkgs.python33Packages; + python34Packages = packagePlatforms pkgs.python34Packages; + python35Packages = packagePlatforms pkgs.python35Packages; }) From c9b5ff02c7f1f4e1fea764f2993514da84a69782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 10:41:23 +0100 Subject: [PATCH 035/157] buildPythonPackage: fix more wheels failures --- pkgs/top-level/python-packages.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e60ca1c95bf..51bcb69170d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3406,6 +3406,11 @@ let sha256 = "1qf3iiv401vhsdmf4bd08fwb3fq4xq769q2yl7zqqr1iml7w3l2s"; }; + # no idea what that file is doing there (probably bad release) + preCheck = '' + rm src/tests/x.py + ''; + meta = { homepage = http://pypi.python.org/pypi/decorator; description = "Better living through Python with decorators"; @@ -4143,7 +4148,7 @@ let }; }; - functools32 = buildPythonPackage rec { + functools32 = if isPy3k then null else buildPythonPackage rec { name = "functools32-${version}"; version = "3.2.3-2"; @@ -10556,7 +10561,6 @@ let preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; inherit (support) preBuild checkPhase; @@ -11010,12 +11014,13 @@ let bandit = buildPythonPackage rec { name = "bandit-${version}"; - version = "0.14.1"; - disabled = isPyPy; # a test fails + version = "0.16.1"; + disabled = isPy33; + doCheck = !isPyPy; # a test fails src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bandit/${name}.tar.gz"; - sha256 = "1hsc3qn3srzx76zl8z3hg0vjp8m6mk9ylfhhgw5bcwbjz3x82ifl"; + sha256 = "0qd9kxknac5n5xfl5zjnlmk6jr94krkcx29zgyna8p9lyb828hsk"; }; propagatedBuildInputs = with self; [ pbr six pyyaml appdirs stevedore ]; @@ -19736,8 +19741,9 @@ let url = "http://pypi.python.org/packages/source/p/pyzmq/${name}.tar.gz"; sha256 = "1gbpgz4ngfw5x6zlsa1k0jwy5vd5wg9iz1shdx4zav256ib08vjx"; }; + setupPyBuildFlags = ["-i"]; buildInputs = with self; [ pkgs.zeromq3 ]; - doCheck = false; + propagatedBuildInputs = [ self.py ]; }; tokenserver = buildPythonPackage rec { From 7e57e59dddd262e1a67de46a8878c07de0692557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 12:38:36 +0100 Subject: [PATCH 036/157] buildPythonPackage: fix numpy --- .../python-modules/numpy-scipy-support.nix | 27 +++---------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix index 915b27cb4cd..422de794e31 100644 --- a/pkgs/development/python-modules/numpy-scipy-support.nix +++ b/pkgs/development/python-modules/numpy-scipy-support.nix @@ -16,30 +16,9 @@ # .test() function, which will run the test suite. checkPhase = '' runHook preCheck - - _python=${python}/bin/${python.executable} - - # We will "install" into a temp directory, so that we can run the - # tests (see below). - install_dir="$TMPDIR/test_install" - install_lib="$install_dir/lib/${python.libPrefix}/site-packages" - mkdir -p $install_dir - $_python setup.py install \ - --install-lib=$install_lib \ - --old-and-unmanageable \ - --prefix=$install_dir > /dev/null - - # Create a directory in which to run tests (you get an error if you try to - # import the package when you're in the current directory). - mkdir $TMPDIR/run_tests - pushd $TMPDIR/run_tests > /dev/null - # Temporarily add the directory we installed in to the python path - # (not permanently, or this pythonpath will wind up getting exported), - # and run the test suite. - PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \ - 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' - popd > /dev/null - + pushd dist + ${python.interpreter} -c 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' + popd runHook postCheck ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51bcb69170d..eb58a9141f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10565,8 +10565,6 @@ let inherit (support) preBuild checkPhase; - setupPyBuildFlags = ["-i" "--fcompiler='gnu95'"]; - buildInputs = [ pkgs.gfortran self.nose ]; propagatedBuildInputs = [ support.openblas ]; From 4b23328e392a878c6f8ab7c20849a18a5c413dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 13:09:12 +0100 Subject: [PATCH 037/157] buildPythonPackage: fix more wheels failures --- pkgs/applications/science/spyder/default.nix | 21 +- pkgs/top-level/python-packages.nix | 403 ++++++++++++++----- 2 files changed, 315 insertions(+), 109 deletions(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 382a5cb5532..4bc160a2c28 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -9,26 +9,21 @@ buildPythonPackage rec { name = "spyder-${version}"; - version = "2.3.6"; + version = "2.3.7"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/s/spyder/${name}.zip"; - sha256 = "0e6502e0d3f270ea8916d1a3d7ca29915801d31932db399582bc468c01d535e2"; + sha256 = "0ywgvgcp9s64ys25nfscd2648f7di8544a21b5lb59d4f48z028h"; }; - buildInputs = [ unzip ]; + # NOTE: sphinx makes the build fail with: ValueError: ZIP does not support timestamps before 1980 propagatedBuildInputs = - [ pyside pyflakes rope sphinx numpy scipy matplotlib ipython pylint pep8 ]; + [ pyside pyflakes rope numpy scipy matplotlib ipython pylint pep8 ]; # There is no test for spyder doCheck = false; - # Use setuptools instead of distutils. - preConfigure = '' - export USE_SETUPTOOLS=True - ''; - desktopItem = makeDesktopItem { name = "Spyder"; exec = "spyder"; @@ -41,11 +36,9 @@ buildPythonPackage rec { # Create desktop item postInstall = '' - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications/ - - mkdir -p $out/share/icons - cp spyderlib/images/spyder.svg $out/share/icons/ + mkdir -p $out/share/{applications,icons} + cp $desktopItem/share/applications/* $out/share/applications/ + cp spyderlib/images/spyder.svg $out/share/icons/ ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb58a9141f0..b25c9f62456 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -275,9 +275,8 @@ let }; propagatedBuildInputs = with self ; [ - pycares - ] ++ optional (isPy33) self.asyncio - ++ optional (isPy26 || isPy27) self.trollius; + pycares asyncio + ] ++ optional (isPy26 || isPy27 || isPyPy) self.trollius; meta = { homepage = http://github.com/saghul/aiodns; @@ -556,11 +555,10 @@ let }; }; - asyncio = buildPythonPackage rec { + asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec { name = "asyncio-${version}"; version = "3.4.3"; - disabled = (!isPy33); src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/asyncio/${name}.tar.gz"; @@ -572,7 +570,7 @@ let homepage = http://www.python.org/dev/peps/pep-3156; license = licenses.free; }; - }; + } else null; funcsigs = buildPythonPackage rec { name = "funcsigs-0.4"; @@ -947,7 +945,7 @@ let name = "${pname}-${version}"; version = "0.2.2"; pname = "basiciw"; - disabled = isPy26 || isPy27; + disabled = isPy26 || isPy27 || isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/${pname}/${name}.tar.gz"; @@ -1420,9 +1418,6 @@ let buildInputs = with self; [ nose unittest2 mock ]; - # i can't imagine these were intentionally installed - postInstall = "rm -r $out/${python.sitePackages}/funtests"; - meta = { homepage = https://github.com/celery/billiard; description = "Python multiprocessing fork with improvements and bugfixes"; @@ -2093,10 +2088,11 @@ let }; buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ kombu billiard pytz anyjson ]; + propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp ]; - # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 - doCheck = pythonAtLeast "2.7"; + checkPhase = '' + nosetests $out/${python.sitePackages}/celery/tests/ + ''; meta = { homepage = https://github.com/celery/celery/; @@ -2108,11 +2104,11 @@ let certifi = buildPythonPackage rec { name = "certifi-${version}"; - version = "14.05.14"; + version = "2015.9.6.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/certifi/${name}.tar.gz"; - sha256 = "0s8vxzfz6s4m6fvxc7z25k9j35w0rh6jkw3wwcd1az1mssncn6qy"; + sha256 = "19mfly763c6bzya9dwm6qgc48z4x3gk6ldl6fprdncqhklnjnfnw"; }; meta = { @@ -2635,18 +2631,17 @@ let cryptography = buildPythonPackage rec { # also bump cryptography_vectors - name = "cryptography-1.0.2"; + name = "cryptography-1.1.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cryptography/${name}.tar.gz"; - sha256 = "1jmcidddbbgdavvnvjjc0pda4b9a5i9idsivchn69pqxx68x8k6n"; + sha256 = "1q5snbnn2am85zb5jrnxwzncl4kwa11740ws8g9b4ps5ywx944i9"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors - self.iso8601 self.pyasn1 self.pytest self.py ] + self.iso8601 self.pyasn1 self.pytest self.py self.hypothesis ] ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = [ self.six self.idna self.ipaddress self.pyasn1 ] - ++ optional (!isPyPy) self.cffi + propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules modules.sqlite3 ] ++ optional (pythonOlder "3.4") self.enum34; # IOKit's dependencies are inconsistent between OSX versions, so this is the best we @@ -2656,11 +2651,11 @@ let cryptography_vectors = buildPythonPackage rec { # also bump cryptography - name = "cryptography_vectors-1.0.2"; + name = "cryptography_vectors-1.1.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "0dx98kcypmarwwhi6rjwy30ridys2ja6mc6mjf0svd4nllkaljdq"; + sha256 = "17gi301p3wi39dr4dhrmpfflid3k004jp9cnvdp46b7p5lm6hb3w"; }; }; @@ -3000,8 +2995,7 @@ let sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv"; }; - # pycollada-0.4 needs python-dateutil==1.5 - buildInputs = with self; [ dateutil_1_5 numpy ]; + buildInputs = with self; [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) @@ -6334,15 +6328,15 @@ let }; django_evolution = buildPythonPackage rec { - name = "django_evolution-0.6.9"; + name = "django_evolution-0.7.5"; disabled = isPy3k; src = pkgs.fetchurl { - url = "http://downloads.reviewboard.org/releases/django-evolution/${name}.tar.gz"; - md5 = "c0d7d10bc41898c88b14d434c48766ff"; + url = "https://pypi.python.org/packages/source/d/django_evolution/${name}.tar.gz"; + sha256 = "1qbcx54hq8iy3n2n6cki3bka1m9rp39np4hqddrm9knc954fb7nv"; }; - propagatedBuildInputs = with self; [ django_1_5 ]; + propagatedBuildInputs = with self; [ django_1_6 ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -6549,11 +6543,10 @@ let src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/django-pipeline/${name}.tar.gz"; - md5 = "dff8a4abb2895ee5df335c3fb2775a02"; sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha"; }; - propagatedBuildInputs = with self; [ django futures ]; + propagatedBuildInputs = with self; [ django_1_6 futures ]; meta = with stdenv.lib; { description = "Pipeline is an asset packaging library for Django."; @@ -6562,16 +6555,25 @@ let }; }; + django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec { + name = "django-pipeline-1.3.27"; + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/d/django-pipeline/${name}.tar.gz"; + sha256 = "0iva3cmnh5jw54c7w83nx9nqv523hjvkbjchzd2pb6vzilxf557k"; + }; + }); + djblets = buildPythonPackage rec { - name = "Djblets-0.6.31"; + name = "Djblets-0.9"; src = pkgs.fetchurl { - url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz"; - sha256 = "1yf0dnkj00yzzhbssw88j9gr58ngjfrd6r68p9asf6djishj9h45"; + url = "http://downloads.reviewboard.org/releases/Djblets/0.9/${name}.tar.gz"; + sha256 = "1rr5vjwiiw3kih4k9nawislf701l838dbk5xgizadvwp6lpbpdpl"; }; - propagatedBuildInputs = with self; [ pil django_1_5 feedparser ]; + propagatedBuildInputs = with self; [ + django_1_6 feedparser django_pipeline_1_3 pillowfight pytz ]; meta = { description = "A collection of useful extensions for Django"; @@ -6579,6 +6581,65 @@ let }; }; + pillowfight = buildPythonPackage rec { + name = "pillowfight-${version}"; + version = "0.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pillowfight/pillowfight-${version}.tar.gz"; + sha256 = "1mh1nhcjjgv7x134sv0krri59ng8bp2w6cwsxc698rixba9f3g0m"; + }; + + propagatedBuildInputs = with self; [ + pillow + ]; + meta = with stdenv.lib; { + description = "Pillow Fight"; + homepage = "https://github.com/beanbaginc/pillowfight"; + }; + }; + + + keepalive = buildPythonPackage rec { + name = "keepalive-${version}"; + version = "0.4.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/k/keepalive/keepalive-${version}.tar.gz"; + sha256 = "07vn3b67ajwi7vv37h02kw7hg2z5dxhn9947dnvii05rfr5b27iy"; + }; + + meta = with stdenv.lib; { + description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive."; + homepage = "https://github.com/wikier/keepalive"; + }; + }; + + + SPARQLWrapper = buildPythonPackage rec { + name = "SPARQLWrapper-${version}"; + version = "1.7.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz"; + sha256 = "1dpwwlcdk4m8wr3d9lb24g1xcvs202c0ir4q3jcijy88is3bvgmp"; + }; + + # break circular dependency loop + patchPhase = '' + sed -i '/rdflib/d' requirements.txt + ''; + + propagatedBuildInputs = with self; [ + six isodate pyparsing html5lib keepalive + ]; + + meta = with stdenv.lib; { + description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format."; + homepage = "http://rdflib.github.io/sparqlwrapper"; + }; + }; + dulwich = buildPythonPackage rec { name = "dulwich-${version}"; @@ -6761,10 +6822,9 @@ let }; }; - enum34 = buildPythonPackage rec { + enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec { name = "enum34-${version}"; version = "1.0.4"; - disabled = pythonAtLeast "3.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/enum34/${name}.tar.gz"; @@ -8054,13 +8114,15 @@ let }; hypothesis = pythonPackages.buildPythonPackage rec { - name = "hypothesis-0.7.0"; + name = "hypothesis-1.14.0"; - doCheck = false; + buildInputs = with self; [fake_factory django numpy pytz flake8 pytest ]; + + doCheck = false; # no tests in source src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/h/hypothesis/hypothesis-0.7.0.tar.gz"; - md5 = "0c4112bab04b71979286387b033921b5"; + url = "https://pypi.python.org/packages/source/h/hypothesis/${name}.tar.gz"; + sha256 = "12dxrvn108q2j20brrk6zcb8w00kn3af1c07c0fv572nf2ngyaxy"; }; meta = { @@ -8207,6 +8269,12 @@ let disabled = isPy3k; + patchPhase = '' + # transient failures + substituteInPlace inginious/backend/tests/TestRemoteAgent.py \ + --replace "test_update_task_directory" "noop" + ''; + propagatedBuildInputs = with self; [ requests2 cgroup-utils docker-custom docutils lti mock pygments @@ -8411,14 +8479,18 @@ let }; }; - ipaddress = buildPythonPackage rec { - name = "ipaddress-1.0.7"; + ipaddress = if (pythonAtLeast "3.3") then null else buildPythonPackage rec { + name = "ipaddress-1.0.15"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipaddress/${name}.tar.gz"; - md5 = "5d9ecf415cced476f7781cf5b9ef70c4"; + sha256 = "0dk6ky7akh5j4y3qbpnbi0qby64nyprbkrjm2s32pcfdr77qav5g"; }; + checkPhase = '' + ${python.interpreter} test_ipaddress.py + ''; + meta = { description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; homepage = https://github.com/phihag/ipaddress; @@ -9151,12 +9223,12 @@ let }; markdown = buildPythonPackage rec { - version = "2.3.1"; + version = "2.6.4"; name = "markdown-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz"; - sha256 = "147j9hznv2r187a86d28glmg3pckfrdp0nz9yh7s1aqpawwdkszz"; + sha256 = "1kll5b35wqkhvniwm2kh6rqc43wakv9ls0qm6g5318pjmbkywdp4"; }; # error: invalid command 'test' @@ -9486,17 +9558,20 @@ let }; }; + mitmproxy = buildPythonPackage rec { baseName = "mitmproxy"; - name = "${baseName}-${meta.version}"; + name = "${baseName}-${version}"; + version = "0.14.0"; src = pkgs.fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "0mpyw8iw4l4jv175qlbn0rrlgiz1k79m44jncbdxfj8ddvvvyz2j"; + sha256 = "0mbd3m8x9a5v9skvzayjwaccn5kpgjb5p7hal5rrrcj69d8xrz6f"; }; - buildInputs = with self; [ - pyopenssl pyasn1 urwid pil lxml flask protobuf netlib + propagatedBuildInputs = with self; [ + pyopenssl pyasn1 urwid pillow lxml flask protobuf netlib click + ConfigArgParse pyperclip blinker construct pyparsing html2text tornado ]; doCheck = false; @@ -9509,7 +9584,6 @@ let ''; meta = { - version = "0.10.1"; description = ''Man-in-the-middle proxy''; homepage = "http://mitmproxy.org/"; license = licenses.mit; @@ -10122,26 +10196,47 @@ let }; }; - netlib = buildPythonPackage rec { - baseName = "netlib"; - name = "${baseName}-${meta.version}"; - disabled = (!isPy27); + hpack = buildPythonPackage rec { + name = "hpack-${version}"; + version = "2.0.1"; src = pkgs.fetchurl { - url = "https://github.com/cortesi/netlib/archive/v${meta.version}.tar.gz"; - name = "${name}.tar.gz"; - sha256 = "1x2n126b7fal64fb5fzkp4by7ym0iswn3w9mh6pm4c1vjdpnk592"; + url = "https://pypi.python.org/packages/source/h/hpack/hpack-${version}.tar.gz"; + sha256 = "1k4wa8c52bd6x109bn6hc945595w6aqgzj6ipy6c2q7vxkzalzhd"; }; - buildInputs = with self; [ - pyopenssl pyasn1 + propagatedBuildInputs = with self; [ + ]; + buildInputs = with self; [ + + ]; + + meta = with stdenv.lib; { + description = "========================================"; + homepage = "http://hyper.rtfd.org"; + }; + }; + + + netlib = buildPythonPackage rec { + baseName = "netlib"; + name = "${baseName}-${version}"; + disabled = (!isPy27); + version = "0.14.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/netlib/${name}.tar.gz"; + sha256 = "0xcfjym780wjr32p3g50w2gifqy3589898idzd3fwgj93akv04ng"; + }; + + propagatedBuildInputs = with self; [ pyopenssl pyasn1 certifi passlib + ipaddress backports_ssl_match_hostname_3_4_0_2 hpack ]; doCheck = false; meta = { - version = "0.10"; - description = ''Man-in-the-middle proxy''; + description = "Man-in-the-middle proxy"; homepage = "https://github.com/cortesi/netlib"; license = licenses.mit; }; @@ -11991,7 +12086,7 @@ let sha256 = "19krvycaiximchhv1hcfhz81249m3w3jrbp2h4apn1yf4yrc4y7y"; }; - propagatedBuildInputs = with self; [ eventlet trollius ]; + propagatedBuildInputs = with self; [ eventlet trollius asyncio ]; buildInputs = with self; [ mock ]; # 2 tests error out @@ -12886,6 +12981,9 @@ let url = "https://pypi.python.org/packages/source/p/python-jenkins/${name}.tar.gz"; sha256 = "153gm7pmmn0bymglsgcr2ya0752r2v1hajkx73gl1pk4jifb2gdf"; }; + patchPhase = '' + sed -i 's@python@${python.interpreter}@' .testr.conf + ''; buildInputs = with self; [ mock ]; propagatedBuildInputs = with self; [ pbr pyyaml six multi_key_dict testtools @@ -13657,7 +13755,7 @@ let makeFlags = [ "USESELINUX=0" - "SITELIB=$(out)/lib/${python.libPrefix}/site-packages" + "SITELIB=$(out)/${python.sitePackages}" ]; meta = { @@ -14664,14 +14762,7 @@ let sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i"; }; - configurePhase = "make"; - - # Doesn't work with --old-and-unmanagable - installPhase = '' - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --prefix="$out" - ''; + configurePhase = "make"; doCheck = false; @@ -14778,6 +14869,7 @@ let doCheck = false; }; + pyrax = buildPythonPackage rec { name = "pyrax-1.8.2"; @@ -14787,14 +14879,14 @@ let }; propagatedBuildInputs = with self; [ requests2 ]; + doCheck = false; meta = { + broken = true; # missing lots of dependencies with rackspace-novaclient homepage = "https://github.com/rackspace/pyrax"; license = licenses.mit; description = "Python API to interface with Rackspace"; }; - - doCheck = false; }; @@ -15574,18 +15666,133 @@ let }; }; - reviewboard = buildPythonPackage rec { - name = "ReviewBoard-1.6.22"; + Whoosh = buildPythonPackage rec { + name = "Whoosh-${version}"; + version = "2.7.0"; src = pkgs.fetchurl { - url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz"; - sha256 = "09lc3ccazlyyd63ifxw3w4kzwd60ax2alk1a95ih6da4clg73mxf"; + url = "https://pypi.python.org/packages/source/W/Whoosh/Whoosh-${version}.tar.gz"; + sha256 = "1xx8rqk1v2xs7mxvy9q4sgz2qmgvhf6ygbqjng3pl83ka4f0xz6d"; }; + propagatedBuildInputs = with self; [ + + ]; + buildInputs = with self; [ + pytest + ]; + + meta = with stdenv.lib; { + homepage = "http://bitbucket.org/mchaput/whoosh"; + }; + }; + + pysolr = buildPythonPackage rec { + name = "pysolr-${version}"; + version = "3.3.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pysolr/pysolr-${version}.tar.gz"; + sha256 = "1wapg9n7myn7c82r3nzs2gisfzx52nip8w2mrfy0yih1zn02mnd6"; + }; + + propagatedBuildInputs = with self; [ + requests2 + ]; + buildInputs = with self; [ + + ]; + + meta = with stdenv.lib; { + homepage = "http://github.com/toastdriven/pysolr/"; + }; + }; + + + django-haystack = buildPythonPackage rec { + name = "django-haystack-${version}"; + version = "2.4.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/django-haystack/django-haystack-${version}.tar.gz"; + sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f"; + }; + + doCheck = false; # no tests in source + + buildInputs = with self; [ coverage mock nose geopy ]; + propagatedBuildInputs = with self; [ + django_1_6 dateutil_1_5 Whoosh pysolr elasticsearch + ]; + + patchPhase = '' + sed -i 's/geopy==/geopy>=/' setup.py + sed -i 's/whoosh==/Whoosh>=/' setup.py + ''; + + meta = with stdenv.lib; { + homepage = "http://haystacksearch.org/"; + }; + }; + + geopy = buildPythonPackage rec { + name = "geopy-${version}"; + version = "1.11.0"; + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/geopy/geopy-${version}.tar.gz"; + sha256 = "04j1lxcsfyv03h0n0q7p2ig7a4n13x4x20fzxn8bkazpx6lyal22"; + }; + + doCheck = false; # too much + + buildInputs = with self; [ mock tox pkgs.pylint ]; + meta = with stdenv.lib; { + homepage = "https://github.com/geopy/geopy"; + }; + }; + + django-multiselectfield = buildPythonPackage rec { + name = "django-multiselectfield-${version}"; + version = "0.1.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/django-multiselectfield/django-multiselectfield-${version}.tar.gz"; + sha256 = "0v7wf82f8688srdsym9ajv1j54bxfxwvydypc03f8xyl4c1raziv"; + }; + + propagatedBuildInputs = with self; [ + + ]; + buildInputs = with self; [ + + ]; + + meta = with stdenv.lib; { + description = "django-multiselectfield"; + homepage = "https://github.com/goinnn/django-multiselectfield"; + }; + }; + + + reviewboard = buildPythonPackage rec { + name = "ReviewBoard-2.5.1.1"; + + src = pkgs.fetchurl { + url = "http://downloads.reviewboard.org/releases/ReviewBoard/2.5/${name}.tar.gz"; + sha256 = "14m8yy2aqxnnzi822b797wc9nmkfkp2fqmq24asdnm66bxhyzjwn"; + }; + + patchPhase = '' + sed -i 's/mimeparse/python-mimeparse/' setup.py + sed -i 's/markdown>=2.4.0,<2.4.999/markdown/' setup.py + ''; + propagatedBuildInputs = with self; - [ django_1_5 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments - djblets django_evolution pycrypto modules.sqlite3 - pysvn pil psycopg2 + [ django_1_6 recaptcha_client pytz memcached dateutil_1_5 paramiko flup + pygments djblets django_evolution pycrypto modules.sqlite3 pysvn pillow + psycopg2 django-haystack python_mimeparse markdown django-multiselectfield ]; }; @@ -15601,7 +15808,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ isodate html5lib ]; + propagatedBuildInputs = with self; [ isodate html5lib SPARQLWrapper ]; meta = { description = "A Python library for working with RDF, a simple yet powerful language for representing information"; @@ -16126,12 +16333,8 @@ let buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ]; - buildPhase = '' - ${self.python.interpreter} setup.py build_ext -i --fcompiler='gnu95' - ''; - checkPhase = '' - LC_ALL="en_US.UTF-8" HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests + LC_ALL="en_US.UTF-8" HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/ ''; meta = { @@ -16348,6 +16551,8 @@ let sha256 = "1n8msk71lpl3kv086xr2sv68ppgz6228575xfnbszc6p1mwr64rg"; }; + doCheck = false; # weird error + meta = { description = "A Parser Generator for Python"; homepage = https://pypi.python.org/pypi/SimpleParse; @@ -16585,18 +16790,23 @@ let }; clint = buildPythonPackage rec { - name = "clint-0.4.1"; + name = "clint-0.5.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/clint/${name}.tar.gz"; - md5 = "d0a0952bfcc5f4c5e03c36854665b298"; + sha256 = "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5"; }; + + preBuild = '' + export LC_ALL="en_US.UTF-8" + ''; + checkPhase = '' ${python.interpreter} test_clint.py ''; - buildInputs = with self; [ mock blessings nose nose_progressive ]; + buildInputs = with self; [ mock blessings nose nose_progressive pkgs.glibcLocales ]; propagatedBuildInputs = with self; [ pillow blessings args ]; meta = { @@ -16897,8 +17107,9 @@ let --replace '/usr/' '${pkgs.bash}/' ''; + doCheck = !isPyPy; checkPhase = '' - python test_subprocess32.py + ${python.interpreter} test_subprocess32.py ''; meta = { @@ -19739,9 +19950,11 @@ let url = "http://pypi.python.org/packages/source/p/pyzmq/${name}.tar.gz"; sha256 = "1gbpgz4ngfw5x6zlsa1k0jwy5vd5wg9iz1shdx4zav256ib08vjx"; }; - setupPyBuildFlags = ["-i"]; - buildInputs = with self; [ pkgs.zeromq3 ]; + buildInputs = with self; [ pkgs.zeromq3 pytest]; propagatedBuildInputs = [ self.py ]; + checkPhase = '' + py.test $out/${python.sitePackages}/zmq/ + ''; }; tokenserver = buildPythonPackage rec { @@ -20951,12 +21164,12 @@ let }; html2text = buildPythonPackage rec { - name = "html2text-2014.12.29"; + name = "html2text-2015.11.4"; disabled = ! isPy27; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/h/html2text/html2text-2014.12.29.tar.gz"; - md5 = "c5bd796bdf7d1bfa43f55f1e2b5e4826"; + url = "https://pypi.python.org/packages/source/h/html2text/${name}.tar.gz"; + sha256 = "021pqcshxajhdy4whkawz95v98m8njv5lknzgac0sp8jzl01qls4"; }; propagatedBuildInputs = with pythonPackages; [ ]; From 9bf99a5a4da2e6770dc1211746c55666106621d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 16:21:45 +0100 Subject: [PATCH 038/157] buildPythonPackage: don't do build_ext if not needed --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index d820e0f30ac..048576e0741 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -77,7 +77,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { buildPhase = attrs.buildPhase or '' runHook preBuild cp ${setuppy} nix_run_setup.py - ${python.interpreter} nix_run_setup.py build_ext ${lib.concatStringsSep " " setupPyBuildFlags} bdist_wheel + ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel runHook postBuild ''; From 686dae7c5081b7160c5a36f442ffba63663bc4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 16:27:00 +0100 Subject: [PATCH 039/157] matplotlib: disable a flaky test --- pkgs/development/python-modules/matplotlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index b6789a851cb..70c498ffa78 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py # Failing test: ERROR: test suite for sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py + # Transient errors + sed -i 's/test_invisible_Line_rendering/noop/' lib/matplotlib/tests/test_lines.py ''; From c6c58dc92ddd02b54bc0b999eae09a85bbec6d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 16:39:34 +0100 Subject: [PATCH 040/157] release-python.nix: automatically detect buildPythonPackage --- .../python-modules/generic/default.nix | 2 ++ pkgs/top-level/release-python.nix | 20 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 048576e0741..e836ed3f93b 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -127,5 +127,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { } // meta // { # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; + # a marker for release utilies to discover python packages + isBuildPythonPackage = python.meta.platforms; }; }) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 1c654272bb8..79bbd9d21a0 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -9,12 +9,18 @@ supportedSystems ? [ "x86_64-linux" ] }: +with import ../../lib; with import ./release-lib.nix {inherit supportedSystems; }; -(mapTestOn { - pypyPackages = packagePlatforms pkgs.pypyPackages; - pythonPackages = packagePlatforms pkgs.pythonPackages; - python33Packages = packagePlatforms pkgs.python33Packages; - python34Packages = packagePlatforms pkgs.python34Packages; - python35Packages = packagePlatforms pkgs.python35Packages; -}) +let + packagePython = mapAttrs (name: value: + let res = builtins.tryEval ( + if isDerivation value then + value.meta.isBuildPythonPackage or [] + else if value.recurseForDerivations or false || value.recurseForRelease or false then + packagePython value + else + []); + in if res.success then res.value else [] + ); +in (mapTestOn (packagePython pkgs)) From 64b5e1ce923a4c78cbd96e2f720e37e5aca9dfdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 17:04:31 +0100 Subject: [PATCH 041/157] pythonPackages.zope_testrunner: 4.4.3 -> 4.4.10 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b25c9f62456..17a66033ca4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19679,11 +19679,11 @@ let zope_testrunner = buildPythonPackage rec { name = "zope.testrunner-${version}"; - version = "4.4.3"; + version = "4.4.10"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip"; - sha256 = "1dwk35kg0bmj2lzp4fd2bgp6dv64q5sda09bf0y8j63y53vqbsw8"; + sha256 = "1w09wbqiqmq6hvrammi4fzc7fr129v63gdnzlk4qi2b1xy5qpqab"; }; propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; From 99a64da6001f5e4fec363b6a98afccda61b6d68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 20 Nov 2015 08:34:24 +0100 Subject: [PATCH 042/157] fix wxPython --- .../python-modules/wxPython/2.8.nix | 3 --- .../python-modules/wxPython/generic.nix | 21 ++++++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix index 4a464e572b8..f0a45242415 100644 --- a/pkgs/development/python-modules/wxPython/2.8.nix +++ b/pkgs/development/python-modules/wxPython/2.8.nix @@ -1,9 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.8.12.1"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; - }) diff --git a/pkgs/development/python-modules/wxPython/generic.nix b/pkgs/development/python-modules/wxPython/generic.nix index 8990f5cf4d1..3151dbcfac3 100644 --- a/pkgs/development/python-modules/wxPython/generic.nix +++ b/pkgs/development/python-modules/wxPython/generic.nix @@ -1,31 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, python, buildPythonPackage, isPy3k, isPyPy, wxGTK, openglSupport ? true, pyopengl -, version, sha256, ... +{ stdenv, fetchurl, pkgconfig, python, isPy3k, isPyPy, wxGTK, openglSupport ? true, pyopengl +, version, sha256, wrapPython, setuptools, ... }: assert wxGTK.unicode; -buildPythonPackage rec { +stdenv.mkDerivation rec { + name = "wxPython-${version}"; + inherit version; disabled = isPy3k || isPyPy; doCheck = false; - name = "wxPython-${version}"; - inherit version; - src = fetchurl { url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; inherit sha256; }; - buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) ] - ++ stdenv.lib.optional openglSupport pyopengl; - + pythonPath = [ python setuptools ]; + buildInputs = [ python setuptools pkgconfig wxGTK (wxGTK.gtk) wrapPython ] ++ stdenv.lib.optional openglSupport pyopengl; preConfigure = "cd wxPython"; - setupPyBuildFlags = [ "WXPORT=gtk2" "NO_HEADERS=1" "BUILD_GLCANVAS=${if openglSupport then "1" else "0"}" "UNICODE=1" ]; - installPhase = '' - ${python}/bin/${python.executable} setup.py ${stdenv.lib.concatStringsSep " " setupPyBuildFlags} install --prefix=$out + ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + wrapPythonPrograms ''; passthru = { inherit wxGTK openglSupport; }; From 704c8bab410a077a89e25c8c9fbb76a8da97625e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 20 Nov 2015 13:48:30 +0100 Subject: [PATCH 043/157] buildPythonPackage: fix standalone applications using it --- .../audio/mopidy-mopify/default.nix | 2 +- .../editors/leo-editor/default.nix | 4 +- pkgs/applications/graphics/jbrout/default.nix | 34 ++++----- pkgs/applications/misc/printrun/default.nix | 4 +- pkgs/applications/misc/pytrainer/default.nix | 6 +- pkgs/applications/misc/rtv/default.nix | 2 +- .../networking/cluster/mesos/default.nix | 8 +- .../mailreaders/mailnag/default.nix | 6 -- pkgs/applications/office/zim/default.nix | 74 ++----------------- pkgs/applications/video/devede/default.nix | 4 +- .../virtualization/virt-manager/default.nix | 9 +-- .../python-modules/mygpoclient/default.nix | 6 +- .../sqlalchemy-0.7.10-test-failures.patch | 13 ---- .../tools/build-managers/buildbot/default.nix | 16 ++-- .../jenkins-job-builder/default.nix | 26 ------- pkgs/tools/X11/arandr/default.nix | 5 +- pkgs/tools/backup/attic/default.nix | 1 + pkgs/tools/networking/gmvault/default.nix | 10 +-- .../networking/p2p/tahoe-lafs/default.nix | 35 ++++----- .../virtualization/cloud-init/default.nix | 7 +- pkgs/top-level/all-packages.nix | 12 ++- pkgs/top-level/python-packages.nix | 20 +++-- 22 files changed, 88 insertions(+), 216 deletions(-) delete mode 100644 pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index 770a1a79556..4792a02f341 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "0hhdss4i5436dj37pndxk81a4g3g8f6zqjyv04lhpqcww01290as"; }; - propagatedBuildInputs = [ mopidy ]; + propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; doCheck = false; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 4c7e3cc08af..1c01bff727e 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,9 +1,9 @@ { stdenv, pythonPackages, fetchgit }: + pythonPackages.buildPythonPackage rec { name = "leo-editor-${version}"; - version = "5.1"; - namePrefix = ""; + version = "5.1"; src = fetchgit { url = "https://github.com/leo-editor/leo-editor"; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 496078ffdb2..e37c2c283e4 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -1,36 +1,36 @@ -{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2, lxml, pil, fbida, which }: +{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2, pythonPackages, fbida, which }: -buildPythonPackage { - name = "jbrout-338"; +buildPythonPackage rec { + name = "jbrout-${version}"; version = "338"; + src = fetchsvn { url = "http://jbrout.googlecode.com/svn/trunk"; - rev = "338"; + rev = version; sha256 = "0257ni4vkxgd0qhs73fw5ppw1qpf11j8fgwsqc03b1k1yv3hk4hf"; }; doCheck = false; -# XXX: preConfigure to avoid this -# File "/nix/store/vnyjxn6h3rbrn49m25yyw7i1chlxglhw-python-2.7.1/lib/python2.7/zipfile.py", line 348, in FileHeader -# len(filename), len(extra)) -#struct.error: ushort format requires 0 <= number <= USHRT_MAX - preConfigure = '' + # XXX: patchPhase to avoid this + # File "/nix/store/vnyjxn6h3rbrn49m25yyw7i1chlxglhw-python-2.7.1/lib/python2.7/zipfile.py", line 348, in FileHeader + # len(filename), len(extra)) + #struct.error: ushort format requires 0 <= number <= USHRT_MAX + patchPhase = '' find | xargs touch + + substituteInPlace setup.py --replace "version=__version__" "version=baseVersion" ''; postInstall = '' - mkdir -p $out/bin - echo '#!/bin/sh' > $out/bin/jbrout - echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout + mkdir $out/bin + echo "python $out/${python.sitePackages}/jbrout/jbrout.py" > $out/bin/jbrout chmod +x $out/bin/jbrout - - wrapProgram $out/bin/jbrout \ - --set PYTHONPATH "$out/lib/python:$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pyexiv2}):$(toPythonPath ${lxml}):$(toPythonPath ${pil}):$PYTHONPATH" \ - --set PATH "${fbida}/bin:${which}/bin:$PATH" ''; - buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ]; + buildInputs = [ python makeWrapper which ]; + propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ]; + meta = { homepage = "http://code.google.com/p/jbrout"; description = "Photo manager"; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index b407c739c70..7420441850b 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -16,10 +16,10 @@ python27Packages.buildPythonPackage rec { doCheck = false; + setupPyBuildFlags = ["-i"]; + postPatch = '' sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py - sed -i "s|distutils.core|setuptools|" setup.py - sed -i "s|distutils.command.install |setuptools.command.install |" setup.py ''; postInstall = '' diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 843d0ab93d8..2f731fea1b0 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -27,12 +27,12 @@ pythonPackages.buildPythonPackage rec { # string, which allows setting an explicit MIME type. patches = [ ./pytrainer-webkit.patch ]; - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ dateutil lxml matplotlibGtk pyGtkGlade pywebkitgtk - sqlalchemy sqlalchemy_migrate + sqlalchemy_migrate ]; - buildInputs = [gpsbabel sqlite] ++ pythonPath; + buildInputs = [ gpsbabel sqlite ]; # This package contains no binaries to patch or strip. dontPatchELF = true; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 37a664a4918..47e36e03783 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - requests + requests2 six praw kitchen diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index bb7a60f2b27..f5803018c98 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf , automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython -, setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion +, setuptools, boto, pythonProtobuf, apr, subversion , leveldb, glog, perf, utillinux, libnl, iproute }: @@ -9,14 +9,14 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.23.0"; + version = "0.23.1"; name = "mesos-${version}"; dontDisableStatic = true; src = fetchurl { url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; - sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr"; + sha256 = "0ygvb0xm4m1ilwbfyjbq0dpsviicg2ab98zg96k2ypa2pa69mvpa"; }; patches = [ @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoconf automake114x libtool curl sasl jdk maven - python wrapPython boto distutils-cfg setuptools leveldb + python wrapPython boto setuptools leveldb subversion apr glog ] ++ lib.optionals stdenv.isLinux [ libnl diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index e4253f5bff5..4818de49e42 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -12,12 +12,6 @@ buildPythonPackage rec { sha256 = "0li4kvxjmbz3nqg6bysgn2wdazqrd7gm9fym3rd7148aiqqwa91r"; }; - # Sometimes the generated output isn't identical. It seems like there's a - # race condtion while patching the Mailnag/commons/dist_cfg.py file. This is - # a small workaround to produce deterministic builds. - # For more information see https://github.com/NixOS/nixpkgs/pull/8279 - setupPyBuildFlags = [ "--build-base=$PWD" ]; - buildInputs = [ gettext gtk3 pythonPackages.pygobject3 pythonPackages.dbus pythonPackages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 96749c665b6..d5163eef4d8 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -11,89 +11,25 @@ buildPythonPackage rec { name = "zim-${version}"; version = "0.63"; namePrefix = ""; - + src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; sha256 = "077vf4h0hjmbk8bxj9l0z9rxcb3dw642n32lvfn6vjdna1qm910m"; }; - propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ]; + propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject ]; preBuild = '' mkdir -p /tmp/home export HOME="/tmp/home" - ''; - - setupPyBuildFlags = ["--skip-xdg-cmd"]; - - # - # Exactly identical to buildPythonPackage's version but for the - # `--old-and-unmanagable`, which I removed. This was removed because - # this is a setuptools specific flag and as zim is overriding - # the install step, setuptools could not perform its monkey - # patching trick for the command. Alternate solutions were to - # - # - Remove the custom install step (tested as working but - # also remove the possibility of performing the xdg-cmd - # stuff). - # - Explicitly replace distutils import(s) by their setuptools - # equivalent (untested). - # - # Both solutions were judged unsatisfactory as altering the code - # would be required. - # - # Note that a improved solution would be to expose the use of - # the `--old-and-unmanagable` flag as an option of passed to the - # buildPythonPackage function. - # - # Also note that I stripped all comments. - # - installPhase = '' - runHook preInstall - mkdir -p "$out/lib/${python.libPrefix}/site-packages" - - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --prefix="$out" ${lib.concatStringsSep " " setupPyBuildFlags} - - eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth - if [ -e "$eapth" ]; then - # move colliding easy_install.pth to specifically named one - mv "$eapth" $(dirname "$eapth")/${name}.pth - fi - - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* - - runHook postInstall + sed -i '/zim_install_class,/d' setup.py ''; - # FIXME: this is quick and dirty hack, because zim expects the - # path to the executable in argv[0] therefore the wrapper is - # modified accordingly. - postFixup = '' - wrapProgram "$out/bin/zim" \ - --prefix XDG_DATA_DIRS : "$out/share" - wrapPythonPrograms - - sed -i "s#sys\.argv\[0\] = '.zim-wrapped'#sys.argv[0] = '$out/bin/zim'#g" \ - $out/bin/..zim-wrapped-wrapped - - if test -e $out/nix-support/propagated-build-inputs; then - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages - fi - - createBuildInputsPth build-inputs "$buildInputStrings" - for inputsfile in propagated-build-inputs propagated-native-build-inputs; do - if test -e $out/nix-support/$inputsfile; then - createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" - fi - done + preFixup = '' + export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped" ''; - # Testing fails. doCheck = false; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index b48f0f42936..6520f7ac21f 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -14,11 +14,10 @@ in buildPythonPackage rec { buildInputs = [ ffmpeg ]; - pythonPath = [ pygtk dbus ffmpeg mplayer dvdauthor vcdimager cdrkit ]; + propagatedBuildInputs = [ pygtk dbus ffmpeg mplayer dvdauthor vcdimager cdrkit ]; postPatch = '' substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede" - ''; meta = with stdenv.lib; { @@ -26,5 +25,6 @@ in buildPythonPackage rec { homepage = http://www.rastersoft.com/programas/devede.html; license = licenses.gpl3; maintainers = [ maintainers.bdimcheff ]; + broken = true; # tarball is gone }; } diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 0b1cf9ebc52..b9cfda7b2a7 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -42,16 +42,13 @@ buildPythonPackage rec { patchPhase = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py + rm setup.cfg ''; - configurePhase = '' - sed -i 's/from distutils.core/from setuptools/g' setup.py - sed -i 's/from distutils.command.install/from setuptools.command.install/g' setup.py - python setup.py configure --prefix=$out + postConfigure = '' + ${python.interpreter} setup.py configure --prefix=$out ''; - buildPhase = "true"; - postInstall = '' ${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas ''; diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index e83cc9ad1f4..a901ce774c5 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -8,9 +8,11 @@ buildPythonPackage rec { sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; }; - buildInputs = [ pythonPackages.nose pythonPackages.minimock ]; + buildInputs = with pythonPackages; [ nose minimock ]; - checkPhase = "make test"; + checkPhase = '' + nosetests + ''; meta = { description = "A gpodder.net client library"; diff --git a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch index cca4a202104..5880af40d14 100644 --- a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch +++ b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch @@ -31,19 +31,6 @@ index 416df5a..f07c9ec 100644 .. changelog:: :version: 0.7.10 -diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py -index 9a21a70..6523ccb 100644 ---- a/lib/sqlalchemy/__init__.py -+++ b/lib/sqlalchemy/__init__.py -@@ -120,7 +120,7 @@ - __all__ = sorted(name for name, obj in locals().items() - if not (name.startswith('_') or inspect.ismodule(obj))) - --__version__ = '0.7.10' -+__version__ = '0.7.11' - - del inspect, sys - diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py index 69b94f1..a37f684 100644 --- a/test/engine/test_execute.py diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 8193845770c..a7c4fb89007 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchurl, twisted, dateutil, jinja2 -, sqlalchemy , sqlalchemy_migrate +, sqlalchemy , sqlalchemy_migrate_0_7 , enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null }: @@ -9,12 +9,12 @@ assert enableDebugClient -> pygobject != null && pyGtkGlade != null; buildPythonPackage (rec { - name = "buildbot-0.8.10"; + name = "buildbot-0.8.12"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/b/buildbot/${name}.tar.gz"; - sha256 = "1x5513mjvd3mwwadawk6v3ca2wh5mcmgnn5h9jhq1jw1plp4v5n4"; + sha256 = "1mn4h04sp6smr3ahqfflys15cpn13q9mfkapcs2jc4ppvxv6kdn6"; }; patchPhase = @@ -25,12 +25,12 @@ buildPythonPackage (rec { sed -i "$i" \ -e "s|/usr/bin/python|$(type -P python)|g ; s|/usr/bin/||g" done + + sed -i 's/==/>=/' setup.py ''; - buildInputs = [ ]; - propagatedBuildInputs = - [ twisted dateutil jinja2 sqlalchemy sqlalchemy_migrate + [ twisted dateutil jinja2 sqlalchemy_migrate_0_7 ] ++ stdenv.lib.optional enableDebugClient [ pygobject pyGtkGlade ]; # What's up with this?! 'trial' should be 'test', no? @@ -51,12 +51,9 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = stdenv.lib.licenses.gpl2Plus; - # Of course, we don't really need that on NixOS. :-) description = "Continuous integration system that automates the build/test cycle"; - longDescription = '' The BuildBot is a system to automate the compile/test cycle required by most software projects to validate code changes. By @@ -79,7 +76,6 @@ buildPythonPackage (rec { encouraging them to be more careful about testing before checking in code. ''; - maintainers = with maintainers; [ bjornfor ]; platforms = platforms.all; }; diff --git a/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix b/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix deleted file mode 100644 index 31ab75947df..00000000000 --- a/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, buildPythonPackage, git }: - -let - upstreamName = "jenkins-job-builder"; - version = "1.2.0"; - -in - -buildPythonPackage rec { - name = "${upstreamName}-${version}"; - namePrefix = ""; # Don't prepend "pythonX.Y-" to the name - - src = fetchurl { - url = "https://pypi.python.org/packages/source/j/${upstreamName}/${name}.tar.gz"; - sha256 = "09nxdhb0ilxpmk5gbvik6kj9b6j718j5an903dpcvi3r6vzk9b3p"; - }; - - pythonPath = with pythonPackages; [ pip six pyyaml pbr python-jenkins ]; - doCheck = false; # Requires outdated Sphinx - - meta = { - description = "System for configuring Jenkins jobs using simple YAML files"; - homepage = http://ci.openstack.org/jjb.html; - license = stdenv.lib.licenses.asl20; - }; -} diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 556de1bd8e8..a6af7b99651 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -8,15 +8,14 @@ pythonPackages.buildPythonPackage rec { sha256 = "0d574mbmhaqmh7kivaryj2hpghz6xkvic9ah43s1hf385y7c33kd"; }; - buildPhase = '' + patchPhase = '' rm -rf data/po/* - python setup.py build ''; # no tests doCheck = false; - buildInputs = [pythonPackages.docutils]; + buildInputs = [ pythonPackages.docutils ]; propagatedBuildInputs = [ xrandr pythonPackages.pygtk ]; meta = { diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index e0428193687..0e2462c5ec8 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -16,6 +16,7 @@ python3Packages.buildPythonPackage rec { preConfigure = '' export ATTIC_OPENSSL_PREFIX="${openssl}" + substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index e78dfa5b2ca..aa52e4f3ae2 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -12,19 +12,15 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ - pythonPackages.gdata - pythonPackages.IMAPClient - pythonPackages.Logbook - pythonPackages.argparse - ]; + propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook + argparse ]; startScript = ./gmvault.py; patchPhase = '' cat ${startScript} > etc/scripts/gmvault chmod +x etc/scripts/gmvault - substituteInPlace setup.py --replace "Logbook==0.4.1" "Logbook==0.4.2" + substituteInPlace setup.py --replace "==" ">=" ''; meta = { diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index e82b7b8050e..836f3e1e60c 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,17 +1,14 @@ { fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow -, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial -, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock }: +, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial, python +, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock, zope_interface }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. -let +buildPythonPackage rec { name = "tahoe-lafs-1.10.0"; -in -buildPythonPackage { - inherit name; namePrefix = ""; src = fetchurl { @@ -19,7 +16,7 @@ buildPythonPackage { sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw"; }; - configurePhase = '' + patchPhase = '' sed -i "src/allmydata/util/iputil.py" \ -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" @@ -29,45 +26,43 @@ buildPythonPackage { do sed -i "$i" -e"s/localhost/127.0.0.1/g" done + + sed -i 's/"zope.interface.*"/"zope.interface"/' src/allmydata/_auto_deps.py + sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py ''; - buildInputs = [ unzip ] - ++ [ numpy ]; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 + # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 + buildInputs = [ unzip numpy mock ]; # The `backup' command requires `sqlite3'. propagatedBuildInputs = [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3 - darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 mock + darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface ]; - # The test suite is run in `postInstall'. - doCheck = false; - postInstall = '' # Install the documentation. mkdir -p "$out/share/doc/${name}" cp -rv "docs/"* "$out/share/doc/${name}" find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; + ''; - # Run the tests once everything is installed. - export PYTHON_EGG_CACHE="$TMPDIR" - python setup.py build - python setup.py trial + checkPhase = '' + # TODO: broken with wheels + #${python.interpreter} setup.py trial ''; meta = { description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system"; - longDescription = '' Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem. This filesystem is encrypted and spread over multiple peers in such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = http://allmydata.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; - maintainers = [ lib.maintainers.simons ]; + maintainers = [ lib.maintainers.simons ]; platforms = lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index acdeda81298..af2779e59e3 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -11,20 +11,19 @@ in pythonPackages.buildPythonPackage rec { sha256 = "1mry5zdkfaq952kn1i06wiggc66cqgfp6qgnlpk0mr7nnwpd53wy"; }; - preBuild = '' + patchPhase = '' patchShebangs ./tools substituteInPlace setup.py \ --replace /usr $out \ --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ + --replace 'self.init_system = ""' 'self.init_system = "systemd"' ''; - pythonPath = with pythonPackages; [ cheetah jinja2 prettytable + propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable oauth pyserial configobj pyyaml argparse requests jsonpatch ]; - # TODO: --init-system systemd - meta = { homepage = http://cloudinit.readthedocs.org; description = "provides configuration and customization of cloud instance"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6ff6c26493..b250f8f03a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5050,7 +5050,7 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; - inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; + inherit (pythonPackages) python boto setuptools wrapPython; pythonProtobuf = pythonPackages.protobuf2_5; perf = linuxPackages.perf; }; @@ -5419,7 +5419,7 @@ let }; buildbot = callPackage ../development/tools/build-managers/buildbot { - inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate; + inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate_0_7; dateutil = pythonPackages.dateutil_1_5; }; @@ -5698,7 +5698,7 @@ let jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; - jenkins-job-builder = callPackage ../development/tools/continuous-integration/jenkins-job-builder { }; + jenkins-job-builder = pythonPackages.jenkins-job-builder; kcov = callPackage ../development/tools/analysis/kcov { }; @@ -12098,9 +12098,7 @@ let joe = callPackage ../applications/editors/joe { }; - jbrout = callPackage ../applications/graphics/jbrout { - inherit (pythonPackages) lxml; - }; + jbrout = callPackage ../applications/graphics/jbrout { }; jumanji = callPackage ../applications/networking/browsers/jumanji { webkitgtk = webkitgtk24x; @@ -13111,7 +13109,7 @@ let tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { inherit (pythonPackages) twisted foolscap simplejson nevow zfec pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs - numpy pyasn1 mock; + numpy pyasn1 mock zope_interface; }; tailor = builderDefsPackage (callPackage ../applications/version-management/tailor) {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17a66033ca4..62acdadd763 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -42,13 +42,10 @@ let # helpers - # global distutils config used by buildPythonPackage - distutils-cfg = callPackage ../development/python-modules/distutils-cfg { }; - wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; - substitutions.executable = "${python}/bin/${python.executable}"; + substitutions.executable = python.interpreter; substitutions.magicalSedExpression = let # Looks weird? Of course, it's between single quoted shell strings. # NOTE: Order DOES matter here, so single character quotes need to be @@ -2539,7 +2536,7 @@ let # TypeError: __call__() takes 1 positional argument but 2 were given doCheck = !isPy3k; - buildInputs = with self; [ nose mock ]; + buildInputs = with self; [ mock ]; meta = { description = "Code coverage measurement for python"; @@ -9892,6 +9889,7 @@ let plover = pythonPackages.buildPythonPackage rec { name = "plover-${version}"; version = "2.5.8"; + disabled = !isPy27; meta = { description = "OpenSteno Plover stenography software"; @@ -10358,6 +10356,8 @@ let sha256 = "00qymfgwg4iam4xi0w9bnv7lcb3fypq1hzfafzgs1rfmwaj67g3n"; }; + propagatedBuildInputs = [ self.coverage ]; + doCheck = false; # lot's of transient errors, too much hassle checkPhase = if python.is_py3k or false then '' ${python}/bin/${python.executable} setup.py build_tests @@ -17336,7 +17336,7 @@ let }; - sqlalchemy_migrate = buildPythonPackage rec { + sqlalchemy_migrate_func = sqlalchemy: buildPythonPackage rec { name = "sqlalchemy-migrate-0.10.0"; src = pkgs.fetchurl { @@ -17345,7 +17345,7 @@ let }; buildInputs = with self; [ unittest2 scripttest pytz pkgs.pylint tempest-lib mock testtools ]; - propagatedBuildInputs = with self; [ pbr tempita decorator sqlalchemy_1_0 six sqlparse ]; + propagatedBuildInputs = with self; [ pbr tempita decorator sqlalchemy six sqlparse ]; checkPhase = '' export PATH=$PATH:$out/bin @@ -17365,6 +17365,8 @@ let }; }; + sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy_1_0; + sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy; sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; @@ -18301,16 +18303,12 @@ let meta = { homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - longDescription = '' Twisted is an event-driven networking engine written in Python and licensed under the MIT license. ''; - license = licenses.mit; - maintainers = [ ]; }; }; From 4b9487a7404ab0736a353f3c1756845474e0ead8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 20 Nov 2015 14:15:55 +0100 Subject: [PATCH 044/157] urllib3: more transient test failures --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62acdadd763..26f12eb3711 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3808,6 +3808,7 @@ let doCheck = !isPy3k; # lots of transient failures checkPhase = '' # Not worth the trouble + rm test/with_dummyserver/test_poolmanager.py rm test/with_dummyserver/test_proxy_poolmanager.py rm test/with_dummyserver/test_socketlevel.py # pypy: https://github.com/shazow/urllib3/issues/736 From d83a97823c14ef861ef116098755c19bc81482e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 20 Nov 2015 19:58:38 +0100 Subject: [PATCH 045/157] buildPythonPackage: fix a few more wheel packages --- pkgs/applications/audio/gpodder/default.nix | 15 +---------- pkgs/applications/misc/ocropus/default.nix | 5 ++-- .../networking/cluster/mesos/default.nix | 6 ++--- .../virtualization/virt-manager/default.nix | 25 ++++++------------- 4 files changed, 14 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 58b9be41545..c2ea3510582 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -15,7 +15,7 @@ in buildPythonPackage rec { }; buildInputs = [ - coverage feedparser minimock sqlite3 mygpoclient intltool + coverage minimock sqlite3 mygpoclient intltool gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; @@ -27,8 +27,6 @@ in buildPythonPackage rec { postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile"; - checkPhase = "make unittest"; - preFixup = '' wrapProgram $out/bin/gpodder \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" @@ -40,17 +38,6 @@ in buildPythonPackage rec { postFixup = '' wrapPythonPrograms - if test -e $out/nix-support/propagated-build-inputs; then - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages - fi - - createBuildInputsPth build-inputs "$buildInputStrings" - for inputsfile in propagated-build-inputs propagated-native-build-inputs; do - if test -e $out/nix-support/$inputsfile; then - createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" - fi - done - sed -i "$out/bin/..gpodder-wrapped-wrapped" -e '{ /import sys; sys.argv/d }' diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index b76852b035a..b53a928931b 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -32,14 +32,15 @@ pythonPackages.buildPythonPackage { matplotlib beautifulsoup4 pygtk lxml ]; enableParallelBuilding = true; - + preConfigure = with stdenv.lib; '' - ${concatStrings (map (x: "ln -s ${x.src} models/`basename ${x.name}`;") + ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;") models)} substituteInPlace ocrolib/{common,default}.py --replace /usr/local $out ''; + doCheck = false; # fails checkPhase = '' patchShebangs . substituteInPlace ./run-test \ diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index f5803018c98..0651f729cdc 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -9,14 +9,14 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.23.1"; + version = "0.23.0"; name = "mesos-${version}"; dontDisableStatic = true; src = fetchurl { - url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; - sha256 = "0ygvb0xm4m1ilwbfyjbq0dpsviicg2ab98zg96k2ypa2pa69mvpa"; + url = "http://archive.apache.org/dist/mesos/${version}/${name}.tar.gz"; + sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr"; }; patches = [ diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index b9cfda7b2a7..243b6464bb5 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -18,31 +18,20 @@ buildPythonPackage rec { }; propagatedBuildInputs = - [ eventlet greenlet gflags netaddr sqlalchemy carrot routes - PasteDeploy m2crypto ipy twisted sqlalchemy_migrate + [ eventlet greenlet gflags netaddr carrot routes + PasteDeploy m2crypto ipy twisted sqlalchemy_migrate_0_7 distutils_extra simplejson readline glance cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 - libvirt libxml2Python ipaddr vte libosinfo + libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox + gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme + wrapGAppsHook ] ++ optional spiceSupport spice_gtk; - buildInputs = - [ mox - intltool - gtkvnc - gtk3 - libvirt-glib - avahi - glib - gobjectIntrospection - gsettings_desktop_schemas - gnome3.defaultIconTheme - wrapGAppsHook - dconf - ]; + buildInputs = [ dconf avahi intltool ]; patchPhase = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py - rm setup.cfg + sed -i "/'install_egg_info'/d" setup.py ''; postConfigure = '' From 925300726ddc7471cc400f1ba8561d7560e4f64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 20 Nov 2015 22:17:16 +0100 Subject: [PATCH 046/157] leo-editor: fix build --- pkgs/applications/editors/leo-editor/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 1c01bff727e..597f9148564 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -13,6 +13,11 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pyqt4 sqlite3 ]; + + patchPhase = '' + rm setup.cfg + ''; + meta = { homepage = "http://leoeditor.com"; description = "A powerful folding editor"; From a05a340e26841189997e7a871212570270dd7f68 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 21 Nov 2015 21:04:11 +0000 Subject: [PATCH 047/157] PAM: reorganize the way pam_ecryptfs and pam_mount get their password Run pam_unix an additional time rather than switching it from sufficient to required. This fixes a potential security issue for ecryptfs/pam_mount users as with pam_deny gone, if cfg.unixAuth = False then it is possible to login without a password. --- nixos/modules/security/pam.nix | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 88760574cbc..2ee8a803d2f 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -218,7 +218,7 @@ let # Samba stuff to the Samba module. This requires that the PAM # module provides the right hooks. text = mkDefault - '' + ('' # Account management. account sufficient pam_unix.so ${optionalString config.users.ldap.enable @@ -241,12 +241,22 @@ let "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"} ${optionalString cfg.usbAuth "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} + '' + + # Modules in this block require having the password set in PAM_AUTHTOK. + # pam_unix is marked as 'sufficient' on NixOS which means nothing will run + # after it succeeds. Certain modules need to run after pam_unix + # prompts the user for password so we run it once with 'required' at an + # earlier point and it will run again with 'sufficient' further down. + # We use try_first_pass the second time to avoid prompting password twice + (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount)) '' + auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth + ${optionalString config.security.pam.enableEcryptfs + "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} + ${optionalString cfg.pamMount + "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} + '') + '' ${optionalString cfg.unixAuth - "auth ${if (config.security.pam.enableEcryptfs || cfg.pamMount) then "required" else "sufficient"} pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"} - ${optionalString cfg.pamMount - "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} - ${optionalString config.security.pam.enableEcryptfs - "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} + "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} ${optionalString cfg.otpwAuth "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} ${optionalString cfg.oathAuth @@ -258,7 +268,7 @@ let auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass ''} - ${optionalString (!(config.security.pam.enableEcryptfs || cfg.pamMount)) "auth required pam_deny.so"} + auth required pam_deny.so # Password management. password requisite pam_unix.so nullok sha512 @@ -306,7 +316,7 @@ let "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable) "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} - ''; + ''); }; }; From 2e605199a77af3c094d9ec330dc0c70678113184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 21 Nov 2015 22:16:49 +0100 Subject: [PATCH 048/157] buildPythonPacakage: update docs --- doc/language-support.xml | 41 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index b4f3276265a..386db749041 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -196,12 +196,12 @@ you need it. Currently supported interpreters are python26, python27, - python32, python33, python34 + python33, python34, python35 and pypy. - python is an alias of python27 and python3 is an alias of python34. + python is an alias to python27 and python3 is an alias to python34. @@ -231,7 +231,7 @@ are provided with all modules included. - All packages depending on any Python interpreter get appended $out/${python.libPrefix}/site-packages + All packages depending on any Python interpreter get appended $out/${python.sitePackages} to $PYTHONPATH if such directory exists. @@ -306,7 +306,7 @@ twisted = buildPythonPackage { Most of Python packages that use buildPythonPackage are defined in pkgs/top-level/python-packages.nix and generated for each python interpreter separately into attribute sets python26Packages, - python27Packages, python32Packages, python33Packages, + python27Packages, python35Packages, python33Packages, python34Packages and pypyPackages. @@ -314,20 +314,14 @@ twisted = buildPythonPackage { buildPythonPackage mainly does four things: - - In the configurePhase, it patches - setup.py to always include setuptools before - distutils for monkeypatching machinery to take place. - - In the buildPhase, it calls - ${python.interpreter} setup.py build ... + ${python.interpreter} setup.py bdist_wheel to build a wheel binary zipfile. - In the installPhase, it calls - ${python.interpreter} setup.py install ... + In the installPhase, it installs the wheel file using + pip install *.whl. @@ -336,11 +330,15 @@ twisted = buildPythonPackage { directory to include $PYTHONPATH and $PATH environment variables. + + + In the installCheck/varname> phase, ${python.interpreter} setup.py test + is ran. + - By default doCheck = true is set and tests are run with - ${python.interpreter} setup.py test command in checkPhase. + By default doCheck = true is set As in Perl, dependencies on other Python packages can be specified in the @@ -385,7 +383,7 @@ twisted = buildPythonPackage { setupPyBuildFlags - List of flags passed to setup.py build command. + List of flags passed to setup.py build_ext command. @@ -393,7 +391,7 @@ twisted = buildPythonPackage { pythonPath List of packages to be added into $PYTHONPATH. - Packages in pythonPath are not propagated into user environment + Packages in pythonPath are not propagated (contrary to propagatedBuildInputs). @@ -412,15 +410,6 @@ twisted = buildPythonPackage { - - distutilsExtraCfg - - Extra lines passed to [easy_install] section of - distutils.cfg (acts as global setup.cfg - configuration). - - - makeWrapperArgs From 90f97c125dde6c50b70831e70276cca408f874a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 21 Nov 2015 22:17:04 +0100 Subject: [PATCH 049/157] buildPythonPackage: use pip for development also --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index e836ed3f93b..6975fbf9c89 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -116,7 +116,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { tmp_path=$(mktemp -d) export PATH="$tmp_path/bin:$PATH" export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py develop --prefix $tmp_path + ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path fi ${postShellHook} ''; From 9ffda40349dad415840a0916baa9a55c787c61bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 22 Nov 2015 12:25:48 +0100 Subject: [PATCH 050/157] scikitlearn: 0.17b1 -> 0.17 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26f12eb3711..7b4ebdb7679 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16323,12 +16323,12 @@ let scikitlearn = buildPythonPackage rec { name = "scikit-learn-${version}"; - version = "0.17b1"; + version = "0.17"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = pkgs.fetchurl { url = "https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"; - sha256 = "b5965c888ae44fe3f5a1b15297e5d8e254a41d1848df99e00efc2fc643e6e8f2"; + sha256 = "9946ab26bec8ba771a366c6c496514e37da88b9cb4cd05b3bb1c031eb1da1168"; }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; From d2519c1f160e7cb63a845a5a2f57b340ea8d05aa Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 23 Nov 2015 14:41:17 +0100 Subject: [PATCH 051/157] pythonPackages: use self instead of pythonPackages in python-packages.nix file --- pkgs/top-level/python-packages.nix | 53 ++++++++++++++---------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b4ebdb7679..dc329c9c805 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -36,7 +36,7 @@ let crypt = null; }; - pythonPackages = modules // { +in modules // { inherit python isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage; @@ -1369,7 +1369,7 @@ let }; }; - proboscis = pythonPackages.buildPythonPackage rec { + proboscis = buildPythonPackage rec { name = "proboscis-1.2.6.0"; src = pkgs.fetchurl { @@ -1377,7 +1377,7 @@ let md5 = "e4b36449ef7c18f70b8243f4c8bddbca"; }; - propagatedBuildInputs = with pythonPackages; [ nose ]; + propagatedBuildInputs = with self; [ nose ]; doCheck = false; meta = { @@ -4165,7 +4165,7 @@ let repo = "GateOne"; sha256 ="0zp9vfs6sqbx4d0g45kkjinfmsl9zqwa6bhp3xd81wx3ph9yr1hq"; }; - propagatedBuildInputs = with pkgs.pythonPackages; [tornado futures html5lib readline pkgs.openssl]; + propagatedBuildInputs = with pkgs.self; [tornado futures html5lib readline pkgs.openssl]; meta = { homepage = https://liftoffsoftware.com/; description = "GateOne is a web-based terminal emulator and SSH client"; @@ -4249,7 +4249,7 @@ let }; }; - gmusicapi = with pkgs; pythonPackages.buildPythonPackage rec { + gmusicapi = with pkgs; buildPythonPackage rec { name = "gmusicapi-4.0.0"; src = pkgs.fetchurl { @@ -4257,7 +4257,7 @@ let md5 = "12ba66607531978b349c7035c9bab311"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with self; [ validictory decorator mutagen @@ -5214,7 +5214,7 @@ let }; }; - pies2overrides = pythonPackages.buildPythonPackage rec { + pies2overrides = buildPythonPackage rec { name = "pies2overrides-2.6.5"; disabled = isPy3k; @@ -5232,7 +5232,7 @@ let }; }; - pirate-get = pythonPackages.buildPythonPackage rec { + pirate-get = buildPythonPackage rec { name = "pirate-get-${version}"; version = "0.2.8"; @@ -6041,7 +6041,7 @@ let }; }; - validictory = pythonPackages.buildPythonPackage rec { + validictory = buildPythonPackage rec { name = "validictory-1.0.0a2"; src = pkgs.fetchurl { @@ -6049,7 +6049,6 @@ let md5 = "54c206827931cc4ed8a9b1cc78e380c5"; }; - propagatedBuildInputs = with pythonPackages; [ ]; doCheck = false; meta = { @@ -8111,7 +8110,7 @@ let }; }; - hypothesis = pythonPackages.buildPythonPackage rec { + hypothesis = buildPythonPackage rec { name = "hypothesis-1.14.0"; buildInputs = with self; [fake_factory django numpy pytz flake8 pytest ]; @@ -9887,7 +9886,7 @@ let }; }); - plover = pythonPackages.buildPythonPackage rec { + plover = buildPythonPackage rec { name = "plover-${version}"; version = "2.5.8"; disabled = !isPy27; @@ -10812,7 +10811,7 @@ let }; }); - oauth2client = pythonPackages.buildPythonPackage rec { + oauth2client = buildPythonPackage rec { name = "oauth2client-1.4.12"; src = pkgs.fetchurl { @@ -10820,7 +10819,7 @@ let sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; }; - propagatedBuildInputs = with pythonPackages; [ six httplib2 pyasn1 pyasn1-modules rsa ]; + propagatedBuildInputs = with self; [ six httplib2 pyasn1 pyasn1-modules rsa ]; doCheck = false; meta = { @@ -13642,11 +13641,9 @@ let }; }; - pycosat = pythonPackages.buildPythonPackage rec { + pycosat = buildPythonPackage rec { name = "pycosat-0.6.0"; - propagatedBuildInputs = with pythonPackages; [ ]; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pycosat/${name}.tar.gz"; sha256 = "02sdn2998jlrm35smn1530hix3kzwyc1jv49cjdcnvfvrqqi3rww"; @@ -13981,7 +13978,7 @@ let }; }); - pyenchant = pythonPackages.buildPythonPackage rec { + pyenchant = buildPythonPackage rec { name = "pyenchant-1.6.6"; src = pkgs.fetchurl { @@ -13989,7 +13986,7 @@ let md5 = "9f5acfd87d04432bf8df5f9710a17358"; }; - propagatedBuildInputs = with pythonPackages; [ pkgs.enchant ]; + propagatedBuildInputs = [ pkgs.enchant ]; patchPhase = let path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; @@ -14090,7 +14087,7 @@ let }; }; - pygeoip = pythonPackages.buildPythonPackage rec { + pygeoip = buildPythonPackage rec { name = "pygeoip-0.3.2"; src = pkgs.fetchurl { @@ -18444,7 +18441,7 @@ let sha256 = "0f2lyi7xhvb60pvzx82dpc13ksdj5k92ww09czclkdz8k0dxa7hb"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with self; [ pyperclip urwid ]; @@ -18458,7 +18455,7 @@ let }; }; - update_checker = pythonPackages.buildPythonPackage rec { + update_checker = buildPythonPackage rec { name = "update_checker-0.11"; src = pkgs.fetchurl { @@ -18466,7 +18463,7 @@ let md5 = "1daa54bac316be6624d7ee77373144bb"; }; - propagatedBuildInputs = with pythonPackages; [ requests2 ]; + propagatedBuildInputs = with self; [ requests2 ]; doCheck = false; @@ -18895,7 +18892,7 @@ let - willie = pythonPackages.buildPythonPackage rec { + willie = buildPythonPackage rec { name = "willie-5.2.0"; src = pkgs.fetchurl { @@ -18903,7 +18900,7 @@ let md5 = "a19f8c34e10e3c2d0d915c894224e521"; }; - propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; + propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; meta = { description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python"; @@ -20280,7 +20277,7 @@ let }; - veryprettytable = pythonPackages.buildPythonPackage rec { + veryprettytable = buildPythonPackage rec { name = "veryprettytable-${version}"; version = "0.8.1"; @@ -21171,8 +21168,6 @@ let sha256 = "021pqcshxajhdy4whkawz95v98m8njv5lknzgac0sp8jzl01qls4"; }; - propagatedBuildInputs = with pythonPackages; [ ]; - meta = { homepage = https://github.com/Alir3z4/html2text/; }; @@ -22053,4 +22048,4 @@ let }; }; -}; in pythonPackages +} From fc611fe634afc96490f08046e7fdfadc7cb29f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 23 Nov 2015 17:19:33 +0100 Subject: [PATCH 052/157] buildPythonPackage: fix --prefix also for pip install -e --- .../bootstrapped-pip/pip-7.0.1-prefix.patch | 32 +++++ .../bootstrapped-pip/prefix.patch | 115 ------------------ 2 files changed, 32 insertions(+), 115 deletions(-) delete mode 100644 pkgs/development/python-modules/bootstrapped-pip/prefix.patch diff --git a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch b/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch index 1dc7cc5dc3a..21936ec99e6 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch +++ b/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch @@ -117,3 +117,35 @@ index 403f48b..14eb141 100644 ) if root_is_purelib(name, wheeldir): +diff --git a/pip/req/req_install.py b/pip/req/req_install.py +index 51bf4a7..e2e285e 100644 +--- a/pip/req/req_install.py ++++ b/pip/req/req_install.py +@@ -795,7 +795,7 @@ exec(compile( + def install(self, install_options, global_options=[], root=None, + prefix=None): + if self.editable: +- self.install_editable(install_options, global_options) ++ self.install_editable(install_options, global_options, prefix=prefix) + return + if self.is_wheel: + version = pip.wheel.wheel_version(self.source_dir) +@@ -929,12 +929,16 @@ exec(compile( + rmtree(self._temp_build_dir) + self._temp_build_dir = None + +- def install_editable(self, install_options, global_options=()): ++ def install_editable(self, install_options, global_options=(), prefix=None): + logger.info('Running setup.py develop for %s', self.name) + + if self.isolated: + global_options = list(global_options) + ["--no-user-cfg"] + ++ if prefix: ++ prefix_param = ['--prefix={0}'.format(prefix)] ++ install_options = list(install_options) + prefix_param ++ + with indent_log(): + # FIXME: should we do --install-headers here too? + cwd = self.source_dir + diff --git a/pkgs/development/python-modules/bootstrapped-pip/prefix.patch b/pkgs/development/python-modules/bootstrapped-pip/prefix.patch deleted file mode 100644 index e3e96659942..00000000000 --- a/pkgs/development/python-modules/bootstrapped-pip/prefix.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/pip/commands/install.py b/pip/commands/install.py -index ddaa470..b798433 100644 ---- a/pip/commands/install.py -+++ b/pip/commands/install.py -@@ -147,6 +147,13 @@ class InstallCommand(Command): - "directory.") - - cmd_opts.add_option( -+ '--prefix', -+ dest='prefix_path', -+ metavar='dir', -+ default=None, -+ help="Installation prefix where lib, bin and other top-level folders are placed") -+ -+ cmd_opts.add_option( - "--compile", - action="store_true", - dest="compile", -@@ -350,6 +357,7 @@ class InstallCommand(Command): - install_options, - global_options, - root=options.root_path, -+ prefix=options.prefix_path, - ) - reqs = sorted( - requirement_set.successfully_installed, -diff --git a/pip/locations.py b/pip/locations.py -index dfbc6da..b2f3383 100644 ---- a/pip/locations.py -+++ b/pip/locations.py -@@ -209,7 +209,7 @@ site_config_files = [ - - - def distutils_scheme(dist_name, user=False, home=None, root=None, -- isolated=False): -+ isolated=False, prefix=None): - """ - Return a distutils install scheme - """ -@@ -231,6 +231,10 @@ def distutils_scheme(dist_name, user=False, home=None, root=None, - # or user base for installations during finalize_options() - # ideally, we'd prefer a scheme class that has no side-effects. - i.user = user or i.user -+ if user: -+ i.prefix = "" -+ else: -+ i.prefix = prefix or i.prefix - i.home = home or i.home - i.root = root or i.root - i.finalize_options() -diff --git a/pip/req/req_install.py b/pip/req/req_install.py -index 38013c5..14b868b 100644 ---- a/pip/req/req_install.py -+++ b/pip/req/req_install.py -@@ -806,7 +806,7 @@ exec(compile( - else: - return True - -- def install(self, install_options, global_options=(), root=None): -+ def install(self, install_options, global_options=[], root=None, prefix=None): - if self.editable: - self.install_editable(install_options, global_options) - return -@@ -814,7 +814,7 @@ exec(compile( - version = pip.wheel.wheel_version(self.source_dir) - pip.wheel.check_compatibility(version, self.name) - -- self.move_wheel_files(self.source_dir, root=root) -+ self.move_wheel_files(self.source_dir, root=root, prefix=prefix) - self.install_succeeded = True - return - -@@ -839,6 +839,8 @@ exec(compile( - - if root is not None: - install_args += ['--root', root] -+ if prefix is not None: -+ install_args += ['--prefix', prefix] - - if self.pycompile: - install_args += ["--compile"] -@@ -1008,12 +1010,13 @@ exec(compile( - def is_wheel(self): - return self.link and self.link.is_wheel - -- def move_wheel_files(self, wheeldir, root=None): -+ def move_wheel_files(self, wheeldir, root=None, prefix=None): - move_wheel_files( - self.name, self.req, wheeldir, - user=self.use_user_site, - home=self.target_dir, - root=root, -+ prefix=prefix, - pycompile=self.pycompile, - isolated=self.isolated, - ) -diff --git a/pip/wheel.py b/pip/wheel.py -index 57246ca..738a6b0 100644 ---- a/pip/wheel.py -+++ b/pip/wheel.py -@@ -130,12 +130,12 @@ def get_entrypoints(filename): - - - def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None, -- pycompile=True, scheme=None, isolated=False): -+ pycompile=True, scheme=None, isolated=False, prefix=None): - """Install a wheel""" - - if not scheme: - scheme = distutils_scheme( -- name, user=user, home=home, root=root, isolated=isolated -+ name, user=user, home=home, root=root, isolated=isolated, prefix=prefix, - ) - - if root_is_purelib(name, wheeldir): From d82f55aeadebc4f45b228b8172115023e92a6de2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 23 Nov 2015 17:43:32 +0100 Subject: [PATCH 053/157] pythonPackages: shellHook of buildPythonPackages needs tmp_path to have lib/pythonX.Y/site-packages folder --- pkgs/development/python-modules/generic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6975fbf9c89..0b50e10f88d 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -116,6 +116,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { tmp_path=$(mktemp -d) export PATH="$tmp_path/bin:$PATH" export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" + mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path fi ${postShellHook} From cf5984e4bf3a6b75d43077f7cbcd4bd7fa4ba08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 23 Nov 2015 17:47:35 +0100 Subject: [PATCH 054/157] buildPythonPackage: fix support for pypy --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 0b50e10f88d..67f03d36fa8 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -116,7 +116,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { tmp_path=$(mktemp -d) export PATH="$tmp_path/bin:$PATH" export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" - mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages + mkdir -p $tmp_path/${python.sitePackages} ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path fi ${postShellHook} From 7352b16ee8f698e299082c88ed2f267e11aa423e Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 22 Nov 2015 14:28:51 -0600 Subject: [PATCH 055/157] pythonPackages.requests-cache: init at 0.4.10 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 356f5d0c59c..420c9800917 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3266,6 +3266,27 @@ let }; }; + requests-cache = buildPythonPackage (rec { + name = "requests-cache-${version}"; + version = "0.4.10"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/r/requests-cache/${name}.tar.gz"; + sha256 = "671969d00719fa3e80476b128dc9232025926884d0110d4d235abdd9c3508fc0"; + }; + + buildInputs = with self; [ mock sqlite3 ]; + + propagatedBuildInputs = with self; [ self.six requests2 ]; + + meta = { + description = "Persistent cache for requests library"; + homepage = http://pypi.python.org/pypi/requests-cache; + license = licenses.bsd3; + }; + }); + dateutil = buildPythonPackage (rec { name = "dateutil-${version}"; version = "2.4.2"; From 4fc7708fe515f79d522b7d76e06d4f586910d3f3 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 22 Nov 2015 14:35:23 -0600 Subject: [PATCH 056/157] pythonPackages.howodoi: init at 1.1.7 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 420c9800917..025e278b2e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3287,6 +3287,24 @@ let }; }); + howdoi = buildPythonPackage (rec { + name = "howdoi-${version}"; + version = "1.1.7"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/h/howdoi/${name}.tar.gz"; + sha256 = "df4e49a219872324875d588e7699a1a82174a267e8487505e86bfcb180aea9b7"; + }; + + propagatedBuildInputs = with self; [ self.six requests-cache pygments pyquery ]; + + meta = { + description = "Instant coding answers via the command line"; + homepage = http://pypi.python.org/pypi/howdoi; + license = licenses.mit; + }; + }); + dateutil = buildPythonPackage (rec { name = "dateutil-${version}"; version = "2.4.2"; From 77fc934dd6e582b8d598e73217f37839c5fa6364 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 22 Nov 2015 14:38:32 -0600 Subject: [PATCH 057/157] pythonPackages.nose-parameterized: init at 0.5.0 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 025e278b2e7..b9101caa5a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3305,6 +3305,24 @@ let }; }); + nose-parameterized = buildPythonPackage (rec { + name = "nose-parameterized-${version}"; + version = "0.5.0"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/n/nose-parameterized/${name}.tar.gz"; + sha256 = "a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685"; + }; + + propagatedBuildInputs = with self; [ self.six ]; + + meta = { + description = "Parameterized testing with any Python test framework"; + homepage = http://pypi.python.org/pypi/nose-parameterized; + license = licenses.bsd3; + }; + }); + dateutil = buildPythonPackage (rec { name = "dateutil-${version}"; version = "2.4.2"; From 3af9cc1d9931a3f9fab775e5530e26a07c2f4426 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 22 Nov 2015 14:43:20 -0600 Subject: [PATCH 058/157] pythonPackages.jdatetime: init at 1.7.1 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9101caa5a3..0421f17c490 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3323,6 +3323,24 @@ let }; }); + jdatetime = buildPythonPackage (rec { + name = "jdatetime-${version}"; + version = "1.7.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/j/jdatetime/${name}.tar.gz"; + sha256 = "c08ba5791c2350b26e87ddf478bf223108146e241b6c949538221b54afd633ac"; + }; + + propagatedBuildInputs = with self; [ self.six ]; + + meta = { + description = "Jalali datetime binding for python"; + homepage = http://pypi.python.org/pypi/jdatetime; + license = licenses.psfl; + }; + }); + dateutil = buildPythonPackage (rec { name = "dateutil-${version}"; version = "2.4.2"; From 59959d00126583b5cae91e8993728ffbd86c112c Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 22 Nov 2015 14:46:12 -0600 Subject: [PATCH 059/157] pythonPackages.dateparser: init at 1.3.1 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0421f17c490..80e0ea9bd63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3341,6 +3341,27 @@ let }; }); + dateparser = buildPythonPackage (rec { + name = "dateparser-${version}"; + version = "0.3.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/d/dateparser/${name}.tar.gz"; + sha256 = "56c291a45398e9172d53201ac213226989295749191c1f02d8f3b593b6f88e48"; + }; + + buildInputs = with self; [ nose nose-parameterized mock ]; + + propagatedBuildInputs = with self; [ self.six jdatetime pyyaml dateutil ]; + + meta = { + description = "Date parsing library designed to parse dates from HTML pages"; + homepage = http://pypi.python.org/pypi/dateparser; + license = licenses.bsd3; + }; + }); + dateutil = buildPythonPackage (rec { name = "dateutil-${version}"; version = "2.4.2"; From 4dbdcd0f33daba0746cc335c44eef88b08675744 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 25 Nov 2015 20:37:18 +0100 Subject: [PATCH 060/157] minisign: 0.4 -> 0.6 --- pkgs/tools/security/minisign/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 48de14ddce6..781ca6ca600 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minisign-${version}"; - version = "0.4"; + version = "0.6"; src = fetchurl { url = "https://github.com/jedisct1/minisign/archive/${version}.tar.gz"; - sha256 = "1k1dk6piaz8pw4b9zg55n4wcpyc301mkxb873njm8mki7r8raxnw"; + sha256 = "029g8ian72fy07k73nf451dw1yggav6crjjc2x6kv4nfpq3pl9pj"; }; buildInputs = [ cmake libsodium ]; From baa24bc1a27df319d70f2048f6fb6ec4b13606f1 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 25 Nov 2015 12:46:28 -0800 Subject: [PATCH 061/157] stunnel: 5.22 -> 5.26 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 29b92029558..ecd98d8155f 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.22"; + version = "5.26"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "0gxqiiksc5p65s67f53yxa2hb8w4hfcgd0s20jrcslw1jjk2imla"; + sha256 = "09i7gizisa04l0gygwbyd3dnzpjmq3ii6c009z4qvv8y05lx941c"; }; buildInputs = [ openssl ]; From cb1c818491c6335aefd3eb3c3e57d76d038f5259 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 25 Nov 2015 12:54:02 -0800 Subject: [PATCH 062/157] openvpn: 2.3.7 -> 2.3.8 --- pkgs/tools/networking/openvpn/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index e7176ba90b3..e780865ab3b 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.7"; + name = "openvpn-2.3.8"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "0vhl0ddpxqfibc0ah0ci7ix9bs0cn5shhmhijg550qpbdb6s80hz"; + sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { --enable-systemd --enable-iproute2 IPROUTE=${iproute}/sbin/ip + '' + optionalString stdenv.isDarwin '' + --disable-plugin-auth-pam ''; postInstall = '' From 2b8ef119c57b9a6fbd6d14e2a95f2c99a7c46eae Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 25 Nov 2015 12:58:07 -0800 Subject: [PATCH 063/157] Revert "coq: 8.5b2 -> 8.5b3" This reverts commit c111b0cd4d3d9b419e63623364132f2e6e55db44. @oconnorr I will restore this once there is more ecosystem to support it. --- pkgs/applications/science/logic/coq/8.5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix index 48013bfc401..2afa18d40a4 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -6,7 +6,7 @@ {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: let - version = "8.5b3"; + version = "8.5b2"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -23,8 +23,8 @@ stdenv.mkDerivation { inherit ocaml camlp5; src = fetchurl { - url = https://coq.inria.fr/distrib/V8.5beta3/files/coq-8.5beta3.tar.gz; - sha256 = "12nnvfz5rsz660j4knhfhfbwq49y2va0rgfrxyiyrr1q4ic84wn6"; + url = https://coq.inria.fr/distrib/V8.5beta2/files/coq-8.5beta2.tar.gz; + sha256 = "1z34ch56lld86srgsjdwdq3girz0k0wqmvyxsa7jwvvxn3qmmq2v"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; From 765afaec8805e4b58c09cf1dc71c0c18232dbda2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 25 Nov 2015 22:59:01 +0100 Subject: [PATCH 064/157] sslmate: make meta.maintainers a list --- pkgs/development/tools/sslmate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index e951f55daea..72af1898451 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://sslmate.com"; - maintainers = maintainers.iElectric; + homepage = https://sslmate.com; + maintainers = [ maintainers.iElectric ]; description = "Easy to buy, deploy, and manage your SSL certs"; platforms = platforms.unix; license = licenses.mit; # X11 From 380ed0229cecbe510239e89f4b5140b770efcba5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 25 Nov 2015 23:00:35 +0100 Subject: [PATCH 065/157] pash: clean up meta information --- pkgs/shells/pash/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 63669def0ab..b9a8397e3ba 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -15,11 +15,11 @@ buildDotnetPackage rec { outputFiles = [ "Source/PashConsole/bin/Release/*" ]; - meta = { + meta = with stdenv.lib; { description = "An open source implementation of Windows PowerShell"; homepage = https://github.com/Pash-Project/Pash; - maintainers = stdenv.lib.maintainers.fornever; - platforms = with stdenv.lib.platforms; all; - license = with stdenv.lib.licenses; [ bsd3 gpl3 ]; + maintainers = [ maintainers.fornever ]; + platforms = platforms.all; + license = with licenses; [ bsd3 gpl3 ]; }; } From 6d25c0f1b3e1f1b514d5d071ca4e954188ee5d84 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 25 Nov 2015 23:04:57 +0100 Subject: [PATCH 066/157] Remove unneeded 'with's from meta.platforms --- pkgs/applications/window-managers/fbpanel/default.nix | 2 +- pkgs/applications/window-managers/stalonetray/default.nix | 2 +- pkgs/development/compilers/eql/default.nix | 2 +- pkgs/os-specific/linux/untie/default.nix | 2 +- pkgs/tools/filesystems/smbnetfs/default.nix | 2 +- pkgs/tools/filesystems/udftools/default.nix | 2 +- pkgs/tools/graphics/zbar/default.nix | 2 +- pkgs/tools/networking/philter/default.nix | 2 +- pkgs/tools/networking/ripmime/default.nix | 2 +- pkgs/tools/networking/tftp-hpa/default.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index ba021a58421..7e23dd60503 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A stand-alone panel"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 0c362dce60b..5ef5ba769c4 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stand alone tray"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index 8f1987c5559..def60aa295f 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Embedded Qt Lisp (ECL+Qt)"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.mit; }; diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index d6b88bfc467..91443eeced5 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to run processes untied from some of the namespaces"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 9936ac0b39a..3bc13d43a36 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A FUSE FS for mounting Samba shares"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.gpl2; downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index 88153f7cb39..329950f8969 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UDF tools"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 2f4e3f63374..48e3316a4a2 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Code. ''; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.lgpl21; homepage = http://zbar.sourceforge.net/; }; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 3d5ed7b34ca..f8f37e05a72 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mail sorter for Maildirs"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index a0a0efa85ba..2a72a530cab 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; homepage = http://www.pldaniels.com/ripmime/; - platforms = with platforms; linux; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index 57dd43cbb44..e95cba18e10 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "TFTP tools - a lot of fixes on top of BSD TFTP"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.bsd3; homepage = http://www.kernel.org/pub/software/network/tftp/; }; From 00a919bb7d5afea39b70953631d569a28b04853d Mon Sep 17 00:00:00 2001 From: Derek Gonyeo Date: Wed, 25 Nov 2015 14:15:10 -0800 Subject: [PATCH 067/157] ykpers: 1.15.0 -> 1.17.2 The version bump was required to work with my yubikey 4 nano. --- pkgs/applications/misc/ykpers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix index e7bfa8ded50..53d260fdc75 100644 --- a/pkgs/applications/misc/ykpers/default.nix +++ b/pkgs/applications/misc/ykpers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "1.15.0"; + version = "1.17.2"; name = "ykpers-${version}"; src = fetchurl { url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz"; - sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd"; + sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh"; }; buildInputs = [pkgconfig libusb1 libyubikey]; From 2455dac3200fad9d30fff8e58535f70c14b3d92a Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 25 Nov 2015 10:09:52 -0800 Subject: [PATCH 068/157] libdevil: fix build in clang stdenvs --- pkgs/development/libraries/libdevil/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 99630198885..3b63ba98f57 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's, -std=gnu99,,g' configure sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c + '' + stdenv.lib.optionalString stdenv.cc.isClang '' + sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in ''; postConfigure = '' From a122a7f65a616ea62af460e3effe4389f19a3131 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 25 Nov 2015 16:35:56 -0800 Subject: [PATCH 069/157] ghcjs: bump version number to 0.2.0 Actually should have been this for a while. --- pkgs/development/compilers/ghcjs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 3fecf26e832..5ddfdc41917 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -40,7 +40,7 @@ , ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit; } , shims ? import ./shims.nix { inherit fetchFromGitHub; } }: -let version = "0.1.0"; in +let version = "0.2.0"; in mkDerivation (rec { pname = "ghcjs"; inherit version; From bf14849534c1d76dff20625a18998ec6954707c8 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 25 Nov 2015 19:49:10 -0500 Subject: [PATCH 070/157] zsh module: add /share/zsh to pathsToLink Needed for completion functions abbradar: replaced optionals with optional --- nixos/modules/programs/zsh/zsh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 9f7596a21e7..dae7e446b4c 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -179,6 +179,8 @@ in environment.systemPackages = [ pkgs.zsh ] ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; + environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; + #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; environment.shells = From 341c250013cf7dea2f0af945a76372e49a8311f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Thu, 26 Nov 2015 09:47:05 +0800 Subject: [PATCH 071/157] grantlee: fix evaluation --- pkgs/development/libraries/grantlee/5.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix index 3323cbaeb4c..9e697a572b9 100644 --- a/pkgs/development/libraries/grantlee/5.x.nix +++ b/pkgs/development/libraries/grantlee/5.x.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://gitorious.org/grantlee; maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (qt5.base.meta) platforms; + inherit (qtbase.meta) platforms; }; } From 2742025f2981191ac5f1365364ac5c6fe19c378f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 25 Nov 2015 16:03:59 +0100 Subject: [PATCH 072/157] apitrace 7.0 -> 7.1 --- pkgs/applications/graphics/apitrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index cd107a6d279..10d4f703a82 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, cmake, libX11, procps, python, qt5 }: -let version = "7.0"; in +let version = "7.1"; in stdenv.mkDerivation { name = "apitrace-${version}"; src = fetchFromGitHub { - sha256 = "0nn3z7i6cd4zkmms6jpp1v2q194gclbs06v0f5hyiwcsqaxzsg5b"; + sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a"; rev = version; repo = "apitrace"; owner = "apitrace"; From da29db5d41e35a2c0e00a230dd0f8673be2aaa4d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 26 Nov 2015 07:56:30 +0100 Subject: [PATCH 073/157] dropbear 2015.68 -> 2015.69 Known changes: - Fix crash when forwarded TCP connections fail to connect (bug introduced in 2015.68) - Avoid hang on session close when multiple sessions are started, affects Qt Creator - Reduce per-channel memory consumption in common case, increase default channel limit from 100 to 1000 which should improve SOCKS forwarding for modern webpages - Handle multiple command line arguments in a single flag - Manpage improvements - Build fixes for Android - Don't display the MOTD when an explicit command is run - Check curve25519 shared secret isn't zero --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 98ea4c82304..d29176876f9 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2015.68"; + name = "dropbear-2015.69"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0ii4lq19b3k06fn25zc5sbbk698s56ldrbg1vcf4pzjgj0g7rsjm"; + sha256 = "1j8pfpi0hjkp77b6x4vjhxfczif4qc4dk30wvxy0sahhzii56ksx"; }; dontDisableStatic = enableStatic; From 540db34fff8d27e944120749fef268115f651215 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 22:05:49 +0100 Subject: [PATCH 074/157] sbcl: remove obsolete dependency on which --- pkgs/development/compilers/sbcl/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index c464d9856fc..7b2cadc31d5 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit", which }: +{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" }: stdenv.mkDerivation rec { name = "sbcl-${version}"; @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n"; }; - buildInputs = [ which ]; - patchPhase = '' echo '"${version}.nixos"' > version.lisp-expr echo " @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' # Fix software version retrieval - sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp + sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp # Fix the tests sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp From 2b6bd6f036e958827b5079cdad005c3ad5872b51 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 22:37:54 +0100 Subject: [PATCH 075/157] add myself as a maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e76de34ba60..758d2fca6df 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -288,6 +288,7 @@ theuni = "Christian Theune "; thoughtpolice = "Austin Seipp "; titanous = "Jonathan Rudenberg "; + tohl = "Tomas Hlavaty "; tokudan = "Daniel Frank "; tomberek = "Thomas Bereknyei "; travisbhartwell = "Travis B. Hartwell "; From b091b9e30bfc5a4ab33179047b5480d7494797f3 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:25:12 +0100 Subject: [PATCH 076/157] gtk-server: add myself as a maintainer --- pkgs/development/interpreters/gtk-server/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 34ca504259e..a318498ca64 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "gtk-server for interpreted GUI programming"; homepage = "http://www.gtk-server.org/"; license = stdenv.lib.licenses.gpl2Plus; + maintainers = [stdenv.lib.maintainers.tohl]; }; } From 5441ab8afccfcd3e71bdd33313e3330d83711501 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:26:04 +0100 Subject: [PATCH 077/157] sbcl: add myself as a maintainer --- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 43002aa72f5..d95e3e0cd89 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Lisp compiler"; homepage = "http://www.sbcl.org"; license = licenses.publicDomain; # and FreeBSD - maintainers = [maintainers.raskin]; + maintainers = [maintainers.raskin maintainers.tohl]; platforms = attrNames options; }; } From a0d1478fa0d54e322c9d48a745fcb3da4744aa40 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:26:26 +0100 Subject: [PATCH 078/157] ccl: add myself as a maintainer --- pkgs/development/compilers/ccl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index de6a041871e..938361146e7 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Clozure Common Lisp"; homepage = http://ccl.clozure.com/; - maintainers = with maintainers; [ raskin muflax ]; + maintainers = with maintainers; [ raskin muflax tohl ]; platforms = attrNames options; license = licenses.lgpl21; }; From f54a2aa1374f9c608ac4c8ff8ab6839716b8fdbe Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:26:42 +0100 Subject: [PATCH 079/157] cmucl: add myself as a maintainer --- pkgs/development/compilers/cmucl/binary.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 1276b1500a1..186cd908351 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.free; # public domain homepage = http://www.cons.org/cmucl/; + maintainers = [stdenv.lib.maintainers.tohl]; }; } From b8bef08d1b45a2123df7b8de46fb0225079fe357 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:26:58 +0100 Subject: [PATCH 080/157] mkcl: add myself as a maintainer --- pkgs/development/compilers/mkcl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 6d17d5a8b25..f6ab05bd29b 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { homepage = https://common-lisp.net/project/mkcl/; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.tohl]; }; } From 594ef50121c61df73085a7064fc4ae496dce8890 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:27:16 +0100 Subject: [PATCH 081/157] picolisp: add myself as a maintainer --- pkgs/development/interpreters/picolisp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index cc9cac3a47f..4bbab756ce3 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://picolisp.com/; license = licenses.mit; platform = platforms.all; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin tohl ]; }; passthru = { From 9d4a60f9cd1a15f4436cf8cf1691a46b47a24165 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 26 Nov 2015 08:18:32 +0100 Subject: [PATCH 082/157] picolisp: 3.1.11 -> 15.11 --- pkgs/development/interpreters/picolisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 4bbab756ce3..0e003af3aff 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,10 +3,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "3.1.11"; + version = "15.11"; src = fetchurl { url = "http://www.software-lab.de/${name}.tgz"; - sha256 = "01kgyz0lkz36lxvibv07qd06gwdxvvbain9f9cnya7a12kq3009i"; + sha256 = "0gi1n7gl786wbz6sn0f0002h49f0zvfrzxlhabkghwlbva1rwp58"; }; buildInputs = optional stdenv.is64bit jdk; patchPhase = optionalString stdenv.isArm '' From 6874221403ec495982cad777c25eef59991c888e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 25 Nov 2015 14:50:40 +0900 Subject: [PATCH 083/157] libchewing: init at 0.4.0 --- lib/maintainers.nix | 1 + .../libraries/libchewing/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libchewing/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e76de34ba60..b0155058741 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -96,6 +96,7 @@ enolan = "Echo Nolan "; epitrochoid = "Mabry Cervin "; ericbmerritt = "Eric Merritt "; + ericsagnes = "Eric Sagnes "; erikryb = "Erik Rybakken "; ertes = "Ertugrul Söylemez "; exlevan = "Alexey Levan "; diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix new file mode 100644 index 00000000000..0521ae8a040 --- /dev/null +++ b/pkgs/development/libraries/libchewing/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, sqlite }: + +stdenv.mkDerivation rec{ + name = "libchewing-${version}"; + version = "0.4.0"; + + src = fetchurl { + url = "https://github.com/chewing/libchewing/releases/download/v${version}/libchewing-${version}.tar.bz2"; + sha256 = "1j5g5j4w6yp73k03pmsq9n2r0p458hqriq0sd5kisj9xrssbynp5"; + }; + + buildInputs = [ sqlite ]; + + meta = with stdenv.lib; { + description = "Intelligent Chinese phonetic input method"; + homepage = http://chewing.im/; + license = licenses.lgpl21; + maintainers = [ maintainers.ericsagnes ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 352f5e1fe14..01a2f4898bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6944,6 +6944,8 @@ let libchardet = callPackage ../development/libraries/libchardet { }; + libchewing = callPackage ../development/libraries/libchewing { }; + libcrafter = callPackage ../development/libraries/libcrafter { }; libuchardet = callPackage ../development/libraries/libuchardet { }; From db28fa4039716f03012357b12be308425b0a30ba Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 25 Nov 2015 14:55:28 +0900 Subject: [PATCH 084/157] fcitx: 4.2.8.5 -> 4.2.9 --- pkgs/tools/inputmethods/fcitx/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index a8b3089c58a..8cdcabf3693 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext , libxml2, enchant, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp -, dbus, gtk2, gtk3, qt4 +, dbus, gtk2, gtk3, qt4, kde5 }: stdenv.mkDerivation rec { name = "fcitx-${version}"; - version = "4.2.8.5"; + version = "4.2.9"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz"; - sha256 = "0whv7mnzig4l5v518r200psa1fp3dyl1jkr5z0q13ijzh1bnyggy"; + sha256 = "0v7wdf3qf74vz8q090w8k574wvfcpj9ksfcfdw93nmzyk1q5p4rs"; }; patchPhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile intltool cairo icu libpthreadstubs libXau libXdmcp - dbus gtk2 gtk3 qt4 + dbus gtk2 gtk3 qt4 kde5.extra-cmake-modules ]; cmakeFlags = '' @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "A Flexible Input Method Framework"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [iyzsong]; + maintainers = with stdenv.lib.maintainers; [iyzsong ericsagnes]; }; } From 6ca51e30621c5daecdd3065444b913a6fb2c9366 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 25 Nov 2015 15:01:45 +0900 Subject: [PATCH 085/157] fcitx-qt5: init at 1.0.4 --- pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix new file mode 100644 index 00000000000..fad7862cf3b --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, fcitx, extra-cmake-modules, qtbase }: + +stdenv.mkDerivation rec { + name = "fcitx-qt5-${version}"; + version = "1.0.4"; + + src = fetchurl { + url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; + sha256 = "070dlmwkim7sg0xwxfcbb46li1jk8yd3rmj0j5fkmgyr12044aml"; + }; + + buildInputs = [ cmake fcitx extra-cmake-modules qtbase ]; + + preInstall = '' + substituteInPlace platforminputcontext/cmake_install.cmake \ + --replace ${qtbase} $out + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/fcitx/fcitx-qt5"; + description = "Qt5 IM Module for Fcitx"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01a2f4898bb..9d87029b715 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6791,6 +6791,8 @@ let kf5PackagesFun = self: with self; { + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; + k9copy = callPackage ../applications/video/k9copy {}; quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { From 97332d30f62b149aa81a63f798e7e53825e12663 Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Thu, 19 Nov 2015 16:52:08 +0100 Subject: [PATCH 086/157] zsh: re-enable tests skipping broken Do not disable all tests, only those broken as zsh/zpty module is not available on hydra. --- pkgs/shells/zsh/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 0e25bba9fe3..7b12ab7cab8 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -21,13 +21,19 @@ stdenv.mkDerivation { buildInputs = [ ncurses coreutils pcre ]; - preConfigure = '' - configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" - ''; + configureFlags = [ + "--enable-maildir-support" + "--enable-multibyte" + "--enable-zprofile=$out/etc/zprofile" + "--with-tcsetpgrp" + "--enable-pcre" + ]; - # Some tests fail on hydra, see - # http://hydra.nixos.org/build/25637689/nixlog/1 - doCheck = false; + # the zsh/zpty module is not available on hydra + # so skip groups Y Z + checkFlagsArray = '' + (TESTNUM=A TESTNUM=B TESTNUM=C TESTNUM=D TESTNUM=E TESTNUM=V TESTNUM=W) + ''; # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' From d96f7128e1ffae5cc028735353b593726432bd17 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 26 Nov 2015 15:00:36 +0300 Subject: [PATCH 087/157] gdb: use system zlib, fix guile support --- pkgs/development/tools/misc/gdb/default.nix | 35 ++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index f90fcb817b1..0f2bc98b017 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,6 +1,8 @@ -{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo -, dejagnu, python, perl, pkgconfig, guile, target ? null - +{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo, zlib +, dejagnu, perl, pkgconfig +, python ? null +, guile ? null +, target ? null # Additional dependencies for GNU/Hurd. , mig ? null, hurd ? null @@ -30,32 +32,29 @@ stdenv.mkDerivation rec { sha256 = "1a08c9svaihqmz2mm44il1gwa810gmwkckns8b0y0v3qz52amgby"; }; - # I think python is not a native input, but I leave it - # here while I will not need it cross building - nativeBuildInputs = [ texinfo python perl ] + nativeBuildInputs = [ pkgconfig texinfo perl ] ++ stdenv.lib.optional isGNU mig; - buildInputs = [ ncurses readline gmp mpfr expat /* pkgconfig guile */ ] + buildInputs = [ ncurses readline gmp mpfr expat zlib python guile ] ++ stdenv.lib.optional isGNU hurd ++ stdenv.lib.optional doCheck dejagnu; enableParallelBuilding = true; configureFlags = with stdenv.lib; - '' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline - --with-expat --with-libexpat-prefix=${expat} - --with-separate-debug-dir=/run/current-system/sw/lib/debug - '' - + optionalString (target != null) " --target=${target.config}" - + optionalString (elem stdenv.system platforms.cygwin) " --without-python"; + [ "--with-gmp=${gmp}" "--with-mpfr=${mpfr}" "--with-system-readline" + "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat}" + "--with-separate-debug-dir=/run/current-system/sw/lib/debug" + ] + ++ optional (target != null) "--target=${target.config}" + ++ optional (elem stdenv.system platforms.cygwin) "--without-python"; crossAttrs = { # Do not add --with-python here to avoid cross building it. - configureFlags = - '' --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} --with-system-readline - --with-expat --with-libexpat-prefix=${expat.crossDrv} --without-python - '' + stdenv.lib.optionalString (target != null) - " --target=${target.config}"; + configureFlags = with stdenv.lib; + [ "--with-gmp=${gmp.crossDrv}" "--with-mpfr=${mpfr.crossDrv}" "--with-system-readline" + "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.crossDrv}" "--without-python" + ] ++ optional (target != null) "--target=${target.config}"; }; postInstall = From 912f60c1e7150f10b190a48b94f2c50978affeaa Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Thu, 26 Nov 2015 14:40:31 +0000 Subject: [PATCH 088/157] Revert part of #9982 to be in line with #9925 When creating PR #9982, I undid a line of PR #9925, that was some cleanups and fixes, so this undoes that damage. --- nixos/modules/tasks/encrypted-devices.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 331531cee15..457b86e95ab 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -30,7 +30,7 @@ let label = mkOption { default = null; example = "rootfs"; - type = types.uniq (types.nullOr types.str); + type = types.nullOr types.str; description = "Label of the unlocked encrypted device. Set fileSystems.<name?>.device to /dev/mapper/<label> to mount the unlocked device."; }; From 1af969f8f326511c08ac7e05a9b9cad049b18df4 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 26 Nov 2015 18:45:20 +0300 Subject: [PATCH 089/157] udisks: apply patch to work with new glibc --- pkgs/os-specific/linux/udisks/1-default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index a0596abb269..98cb616e2d5 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; - patches = [ ./purity.patch ./no-pci-db.patch ]; + patches = [ ./purity.patch ./no-pci-db.patch ./glibc.patch ]; preConfigure = '' From e568fe9cef86bbd475cfdc681eb65c74bd973bf5 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 26 Nov 2015 18:46:08 +0300 Subject: [PATCH 090/157] udisks: add missing patch --- pkgs/os-specific/linux/udisks/glibc.patch | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/os-specific/linux/udisks/glibc.patch diff --git a/pkgs/os-specific/linux/udisks/glibc.patch b/pkgs/os-specific/linux/udisks/glibc.patch new file mode 100644 index 00000000000..85ef5208049 --- /dev/null +++ b/pkgs/os-specific/linux/udisks/glibc.patch @@ -0,0 +1,25 @@ +From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 29 May 2015 21:09:39 -0400 +Subject: [PATCH] Bug 90778 - fix build with newer glibc versions + +https://bugs.freedesktop.org/show_bug.cgi?id=90778 +--- + src/helpers/job-drive-detach.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c +index eeafcab..d122a1f 100644 +--- a/src/helpers/job-drive-detach.c ++++ b/src/helpers/job-drive-detach.c +@@ -18,6 +18,7 @@ + * + */ + ++#include + #include + #include + #include +-- +2.4.2 + From d9b858d67ebb206b488c02d29ed9100c8dfa2c58 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 26 Nov 2015 11:28:17 -0500 Subject: [PATCH 091/157] Partial revert of "parallel: 20150922 -> 20151122" This is a partial revert of commit ed2b30dc283f2ec326fe80dc5259682d1f0f4fb3. The changes outside of a new version of parallel broke several go packages. --- pkgs/tools/misc/parallel/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 48d86f9a5fe..ca347cfe842 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0phn9dlkqlq3cq468ypxbbn78bsjcin743pyvf8ip4qg6jz662jm"; }; - nativeBuildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; preFixup = '' - patchShebangs $out/bin + sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* wrapProgram $out/bin/parallel \ - ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} + ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \ + --prefix PATH : "${perl}/bin" \ ''; doCheck = true; From 0c772699ba3c58fc10bc97f4cd7d93385757d5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 26 Nov 2015 17:31:10 +0100 Subject: [PATCH 092/157] buildPythonPackage: write some comments --- .../python-modules/generic/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 67f03d36fa8..fe62428c0b0 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -13,10 +13,10 @@ , buildInputs ? [] # propagate build dependencies so in case we have A -> B -> C, -# C can import propagated packages by A +# C can import package A propagated by B , propagatedBuildInputs ? [] -# passed to "python setup.py build" +# passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 , setupPyBuildFlags ? [] @@ -50,10 +50,13 @@ then throw "${name} not supported for interpreter ${python.executable}" else let + # use setuptools shim (so that setuptools is imported before distutils) + # pip does the same thing: https://github.com/pypa/pip/pull/3265 setuppy = ./run_setup.py; + # For backwards compatibility, let's use an alias + doInstallCheck = doCheck; in -python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { - +python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // { name = namePrefix + name; buildInputs = [ wrapPython bootstrapped-pip ] ++ buildInputs ++ pythonPath @@ -62,8 +65,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { # propagate python/setuptools to active setup-hook in nix-shell propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; - pythonPath = pythonPath; - configurePhase = attrs.configurePhase or '' runHook preConfigure @@ -74,6 +75,8 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { runHook postConfigure ''; + # we copy nix_run_setup.py over so it's executed relative to the root of the source + # many project make that assumption buildPhase = attrs.buildPhase or '' runHook preBuild cp ${setuppy} nix_run_setup.py @@ -94,8 +97,10 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { runHook postInstall ''; - doInstallCheck = doCheck; - doCheck = false; + # We run all tests after software has been installed since that is + # a common idiom in Python + doInstallCheck = doInstallCheck; + installCheckPhase = attrs.checkPhase or '' runHook preCheck ${python.interpreter} nix_run_setup.py test From a744aa74aa693a76193dd412c826b1190735551a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 26 Nov 2015 17:21:19 +0000 Subject: [PATCH 093/157] disnix: add a target for services activated and deactivated by dysnomia --- nixos/modules/services/misc/disnix.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index c439efe9f8e..0534c4fc942 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -121,6 +121,7 @@ in disnix = { description = "Disnix server"; + wants = [ "dysnomia.target" ]; wantedBy = [ "multi-user.target" ]; after = [ "dbus.service" ] ++ optional config.services.httpd.enable "httpd.service" @@ -137,6 +138,17 @@ in environment = { HOME = "/root"; }; + + preStart = '' + mkdir -p /etc/systemd-mutable/system + if [ ! -f /etc/systemd-mutable/system/dysnomia.target ] + then + ( echo "[Unit]" + echo "Description=Services that are activated and deactivated by Dysnomia" + echo "After=final.target" + ) > /etc/systemd-mutable/system/dysnomia.target + fi + ''; exec = "disnix-service"; }; From ce5b72e8f96c87abf2db1250bc90b7929fd22a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 26 Nov 2015 18:49:00 +0100 Subject: [PATCH 094/157] doc: fix setup.py develop reference --- doc/language-support.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 386db749041..ae650bc2360 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -527,7 +527,7 @@ exist in community to help save time. No tool is preferred at the moment. To develop Python packages buildPythonPackage has additional logic inside shellPhase to run - ${python.interpreter} setup.py develop for the package. + pip install -e . --prefix $TMPDIR/ for the package. shellPhase is executed only if setup.py From f5b5c31d75ed35d02b14d2d48fcb44a1e081ae8f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Nov 2015 20:06:29 +0100 Subject: [PATCH 095/157] python CommonMark: init at 0.5.4 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 351f8626d44..79ddaebf621 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2344,6 +2344,23 @@ let }; + CommonMark = buildPythonPackage rec { + name = "CommonMark-${version}"; + version = "0.5.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/C/CommonMark/${name}.tar.gz"; + sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5"; + }; + + meta = { + description = "Python parser for the CommonMark Markdown spec"; + homepage = https://github.com/rolandshoemaker/CommonMark-py; + license = licenses.bsd3; + }; + }; + + coilmq = buildPythonPackage (rec { name = "coilmq-0.6.1"; From ae866d8dc104e1b03bc3e3c4f3703f93a503a2d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Nov 2015 20:06:44 +0100 Subject: [PATCH 096/157] python recommonmark: init at 0.2.0 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79ddaebf621..185a66b5d14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15442,6 +15442,27 @@ let }; }; + recommonmark = buildPythonPackage rec { + name = "recommonmark-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/recommonmark/${name}.tar.gz"; + sha256 = "28c0babc79c487280fc5bf5daf1f3f1d734e9e4293ba929a7617524ff6911fd7"; + }; + + buildInputs = with self; [ pytest sphinx ]; + propagatedBuildInputs = with self; [ CommonMark docutils ]; + + meta = { + description = "A docutils-compatibility bridge to CommonMark"; + homepage = https://github.com/rtfd/recommonmark; + license = licenses.mit; + maintainer = with maintainers; [ fridh ]; + }; + + }; + redis = buildPythonPackage rec { name = "redis-2.10.3"; From 5a881a6fb1e1020155a37bd191e4bf1f06d1ee21 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 26 Nov 2015 20:19:00 +0100 Subject: [PATCH 097/157] doc: fix typo in language-support.xml --- doc/language-support.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index ae650bc2360..9a88ea4fa6f 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -332,7 +332,7 @@ twisted = buildPythonPackage { - In the installCheck/varname> phase, ${python.interpreter} setup.py test + In the installCheck phase, ${python.interpreter} setup.py test is ran. From 27e621a60e35d781883a0bf62d53549289a62053 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 26 Nov 2015 21:43:11 +0000 Subject: [PATCH 098/157] release-notes: add longview as a new service --- nixos/doc/manual/release-notes/rl-unstable.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 97ac03a770f..bed47a63a95 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -26,6 +26,13 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos; +The following new services were added since the last release: + + + services/monitoring/longview.nix + + + When upgrading from a previous release, please be aware of the following incompatible changes: From 2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 26 Nov 2015 18:44:44 +0100 Subject: [PATCH 099/157] Convert some *Flags from strings to lists --- pkgs/applications/audio/id3v2/default.nix | 4 ++-- .../audio/keyfinder-cli/default.nix | 2 +- .../feedreaders/rsstail/default.nix | 2 +- .../git-and-tools/git-hub/default.nix | 2 +- pkgs/data/documentation/man-pages/default.nix | 2 +- pkgs/development/libraries/libcli/default.nix | 2 +- pkgs/development/libraries/libpsl/default.nix | 2 +- .../analysis/include-what-you-use/default.nix | 15 +++++++------- pkgs/games/2048-in-terminal/default.nix | 2 +- pkgs/games/eduke32/default.nix | 6 +++++- pkgs/os-specific/linux/dstat/default.nix | 2 +- pkgs/os-specific/linux/fatrace/default.nix | 2 +- pkgs/os-specific/linux/freefall/default.nix | 2 +- pkgs/os-specific/linux/ftop/default.nix | 8 +++++--- pkgs/os-specific/linux/mcelog/default.nix | 2 +- pkgs/os-specific/linux/radeontop/default.nix | 3 ++- pkgs/servers/p910nd/default.nix | 2 +- pkgs/tools/compression/lz4/default.nix | 3 ++- pkgs/tools/filesystems/boxfs/default.nix | 5 +++-- pkgs/tools/misc/gparted/default.nix | 2 +- pkgs/tools/networking/minissdpd/default.nix | 2 +- pkgs/tools/networking/netsniff-ng/default.nix | 2 +- .../tools/package-management/dpkg/default.nix | 6 +++++- pkgs/tools/system/foremost/default.nix | 20 +++++++++---------- pkgs/tools/system/stress-ng/default.nix | 2 +- pkgs/tools/text/aha/default.nix | 8 ++++---- 26 files changed, 62 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 94c2cd81002..71dc88b9231 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ groff ]; buildInputs = [ id3lib zlib ]; - makeFlags = "PREFIX=$(out)"; - buildFlags = "clean all"; + makeFlags = [ "PREFIX=$(out)" ]; + buildFlags = [ "clean" "all" ]; preInstall = '' mkdir -p $out/{bin,share/man/man1} diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index dc90aeda47d..701bf6f82f4 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libav libkeyfinder ]; - makeFlagsArray = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 62054ef0613..40c165c2540 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace -liconv_hook "" ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index e657215f2cd..271e1244820 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installFlags = "prefix=$(out)"; + installFlags = [ "prefix=$(out)" ]; postInstall = '' # Remove inert ftdetect vim plugin and a README that's a man page subset: diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index db1c16e4633..923b95040fb 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8"; }; - makeFlags = "MANDIR=$(out)/share/man"; + makeFlags = [ "MANDIR=$(out)/share/man" ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index 0b3f46ab195..7798eb5f8fc 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Emulate a Cisco-style telnet command-line interface"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index caec3c17225..95370b92111 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation { # The libpsl check phase requires the list's test scripts (tests/) as well cp -Rv "${listSources}"/* list ''; - configureFlags = "--disable-static --enable-gtk-doc --enable-man"; + configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 577d058beb1..57d5cadf98c 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -11,7 +11,15 @@ in stdenv.mkDerivation rec { url = "${meta.homepage}/downloads/${name}.src.tar.gz"; }; + buildInputs = with llvmPackages; [ clang llvm ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; + + enableParallelBuilding = true; + meta = with stdenv.lib; { + inherit version; description = "Analyze #includes in C/C++ source files with clang"; longDescription = '' For every symbol (type, function variable, or macro) that you use in @@ -26,11 +34,4 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = with llvmPackages; [ clang llvm ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}"; - - enableParallelBuilding = true; } diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix index b37cd4990de..cbf6a19b319 100644 --- a/pkgs/games/2048-in-terminal/default.nix +++ b/pkgs/games/2048-in-terminal/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/bin ''; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index e0c5798d48d..048688fe033 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -26,7 +26,11 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${SDL2}/include/SDL"; NIX_LDFLAGS = "-L${SDL2}/lib"; - makeFlags = "LINKED_GTK=1 SDLCONFIG=${SDL2}/bin/sdl2-config VC_REV=${rev}"; + makeFlags = [ + "LINKED_GTK=1" + "SDLCONFIG=${SDL2}/bin/sdl2-config" + "VC_REV=${rev}" + ]; desktopItem = makeDesktopItem { name = "eduke32"; diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 6b3b7fac8f3..619e37c2c4b 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { -e "s|/usr/share/dstat|$out/share/dstat|" dstat ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; postInstall = '' wrapPythonProgramsIn $out/bin "$out $pythonPath" diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index c620a0056c1..3a2be543582 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --replace "'which'" "'${which}/bin/which'" ''; - makeFlagsArray = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 53b347b48e3..80ecbad202e 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { substituteInPlace freefall.c --replace "alarm(2)" "alarm(7)" ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Free-fall protection for spinning HP/Dell laptop hard drives"; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index e41a28b256a..022fc33a206 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, ncurses }: +let version = "1.0"; in stdenv.mkDerivation rec { - name = "ftop-1.0"; + name = "ftop-${version}"; src = fetchurl { url = "http://ftop.googlecode.com/files/${name}.tar.bz2"; @@ -14,18 +15,19 @@ stdenv.mkDerivation rec { ./ftop-fix_buffer_overflow.patch ./ftop-fix_printf_format.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; postPatch = '' substituteInPlace configure --replace "curses" "ncurses" ''; meta = with stdenv.lib; { + inherit version; description = "Show progress of open files and file systems"; homepage = https://code.google.com/p/ftop/; license = licenses.gpl3Plus; longDescription = '' - Ftop is to files what top is to processes. The progress of all open files + ftop is to files what top is to processes. The progress of all open files and file systems can be monitored. If run as a regular user, the set of open files will be limited to those in that user's processes (which is generally all that is of interest to the user). diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index f88e4b2fb75..1c0362b80ae 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - installFlags = "DESTDIR=$(out) prefix= DOCDIR=/share/doc"; + installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index ef192196a40..b86486d4584 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -20,9 +20,10 @@ stdenv.mkDerivation { substituteInPlace getver.sh --replace ver=unknown ver=${version} ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { + inherit version; description = "Top-like tool for viewing AMD Radeon GPU utilization"; longDescription = '' View GPU utilization, both for the total activity percent and individual diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index ea5214c7bb4..150bf196b0d 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sed -e "s|/usr||g" -i Makefile ''; - makeFlags = "DESTDIR=$(out) BINDIR=/bin"; + makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ]; postInstall = '' # Match the man page: diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 0ce7e0e3343..e91fae778fd 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -15,12 +15,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; doCheck = false; # tests take a very long time checkTarget = "test"; meta = with stdenv.lib; { + inherit version; description = "Extremely fast compression algorithm"; longDescription = '' Very fast lossless compression algorithm, providing compression speed diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 30bb8d009a0..3c8c1b6e180 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -26,18 +26,18 @@ in stdenv.mkDerivation { name = "boxfs-${version}"; src = srcs.boxfs2; + prePatch = with srcs; '' substituteInPlace Makefile --replace "git pull" "true" cp -a --no-preserve=mode ${libapp} libapp cp -a --no-preserve=mode ${libjson} libjson ''; - patches = [ ./work-around-API-borkage.patch ]; buildInputs = [ curl fuse libxml2 ]; nativeBuildInputs = [ pkgconfig ]; - buildFlags = "static"; + buildFlags = [ "static" ]; installPhase = '' mkdir -p $out/bin @@ -45,6 +45,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { + inherit version; description = "FUSE file system for box.com accounts"; longDescription = '' Store files on box.com (an account is required). The first time you run diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 4cefc8a412f..be5eb0e6621 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gparted/${name}.tar.bz2"; }; - configureFlags = "--disable-doc"; + configureFlags = [ "--disable-doc" ]; buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 82e26ad85c9..f99a3de9046 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { buildInputs = [ libnfnetlink ]; - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index e39787a4fbb..535a96c1db7 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; # All files installed to /etc are just static data that can go in the store - makeFlags = "PREFIX=$(out) ETCDIR=$(out)/etc"; + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; postInstall = '' ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 2357ec77f12..680a8ef1bda 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation { --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" ''; - configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}"; + configureFlags = [ + "--disable-dselect" + "--with-admindir=/var/lib/dpkg" + "PERL_LIBDIR=$(out)/${perl.libPrefix}" + ]; preConfigure = '' # Nice: dpkg has a circular dependency on itself. Its configure diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 0e502edc289..af28565f466 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz"; }; + patches = [ ./makefile.patch ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/{bin,share/man/man8} + ''; + meta = with stdenv.lib; { inherit version; description = "Recover files based on their contents"; @@ -26,14 +36,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - patches = [ ./makefile.patch ]; - - makeFlags = "PREFIX=$(out)"; - - enableParallelBuilding = true; - - preInstall = '' - mkdir -p $out/{bin,share/man/man8} - ''; } diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 4e6f3ed11e8..12c25078839 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 60114b7b3f3..152a46cd50c 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation { owner = "theZiz"; }; + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + meta = with stdenv.lib; { inherit version; description = "ANSI HTML Adapter"; @@ -22,8 +26,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - makeFlags = "PREFIX=$(out)"; - - enableParallelBuilding = true; } From ea8c69039e9e71015fb65675f23beb6b455369f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 26 Nov 2015 18:35:39 +0100 Subject: [PATCH 100/157] freefall 4.2 -> 4.3 --- pkgs/os-specific/linux/freefall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 80ecbad202e..e2aa079240a 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: -let version = "4.2"; in +let version = "4.3"; in stdenv.mkDerivation { name = "freefall-${version}"; src = fetchurl { - sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g"; + sha256 = "1bpkr45i4yzp32p0vpnz8mlv9lk4q2q9awf1kg9khg4a9g42qqja"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { # Default time-out is a little low, probably because the AC/lid status # functions were never implemented. Because no-one still uses HDDs, right? - substituteInPlace freefall.c --replace "alarm(2)" "alarm(7)" + substituteInPlace freefall.c --replace "alarm(2)" "alarm(5)" ''; makeFlags = [ "PREFIX=$(out)" ]; From c85546a89739a354a8a0568556208f1337aadf85 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Nov 2015 00:38:41 +0100 Subject: [PATCH 101/157] pythonPackages.gateone: Fix python packages reference This fixes an error that was introduced with d2519c1f160e7cb63a845a5a2f57b340ea8d05aa. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 516c52bcbbe..8b642f7c007 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4181,7 +4181,7 @@ in modules // { repo = "GateOne"; sha256 ="0zp9vfs6sqbx4d0g45kkjinfmsl9zqwa6bhp3xd81wx3ph9yr1hq"; }; - propagatedBuildInputs = with pkgs.self; [tornado futures html5lib readline pkgs.openssl]; + propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl]; meta = { homepage = https://liftoffsoftware.com/; description = "GateOne is a web-based terminal emulator and SSH client"; From 3cc1f8dd15657c478f2bc145a740942b7aea4ae5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Nov 2015 00:10:02 +0100 Subject: [PATCH 102/157] hplip 3.15.9 -> 3.15.11 Keep 3.15.9 available as hplip{,WithPlugin}_3_15_9 in case this breaks someone's printer/day job. --- pkgs/misc/drivers/hplip/3.15.9.nix | 191 ++++++++++++++++++++++++++++ pkgs/misc/drivers/hplip/default.nix | 6 +- pkgs/top-level/all-packages.nix | 4 + 3 files changed, 198 insertions(+), 3 deletions(-) create mode 100644 pkgs/misc/drivers/hplip/3.15.9.nix diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix new file mode 100644 index 00000000000..04ebb7a55ee --- /dev/null +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -0,0 +1,191 @@ +{ stdenv, fetchurl, substituteAll +, pkgconfig +, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils +, net_snmp, polkit +, qtSupport ? true, qt4, pyqt4 +, withPlugin ? false +}: + +let + + version = "3.15.9"; + + name = "hplip-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/hplip/${name}.tar.gz"; + sha256 = "0vcxz3gsqcamlzx61xm77h7c769ya8kdhzwafa9w2wvkf3l8zxd1"; + }; + + plugin = fetchurl { + url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "1ahalw83xm8x0h6hljhnkknry1hny9flkrlzcymv8nmwgic0kjgs"; + }; + + hplipState = + substituteAll + { + inherit version; + src = ./hplip.state; + }; + + hplipPlatforms = + { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + }; + + hplipArch = hplipPlatforms."${stdenv.system}" + or (throw "HPLIP not supported on ${stdenv.system}"); + + pluginArches = [ "x86_32" "x86_64" ]; + +in + +assert withPlugin -> builtins.elem hplipArch pluginArches + || throw "HPLIP plugin not supported on ${stdenv.system}"; + +stdenv.mkDerivation { + inherit name src; + + buildInputs = [ + libjpeg + cups + libusb1 + pythonPackages.python + pythonPackages.wrapPython + saneBackends + dbus + net_snmp + ] ++ stdenv.lib.optionals qtSupport [ + qt4 + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + pythonPath = with pythonPackages; [ + dbus + pillow + pygobject + recursivePthLoader + reportlab + usbutils + ] ++ stdenv.lib.optionals qtSupport [ + pyqt4 + ]; + + prePatch = '' + # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. + find . -type f -exec sed -i \ + -e s,/etc/hp,$out/etc/hp, \ + -e s,/etc/sane.d,$out/etc/sane.d, \ + -e s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, \ + -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ + -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ + -e s,/var/lib/hp,$out/var/lib/hp, \ + {} + + ''; + + preConfigure = '' + export configureFlags="$configureFlags + --with-cupsfilterdir=$out/lib/cups/filter + --with-cupsbackenddir=$out/lib/cups/backend + --with-icondir=$out/share/applications + --with-systraydir=$out/xdg/autostart + --with-mimedir=$out/etc/cups + --enable-policykit + " + + export makeFlags=" + halpredir=$out/share/hal/fdi/preprobe/10osvendor + rulesdir=$out/etc/udev/rules.d + policykit_dir=$out/share/polkit-1/actions + policykit_dbus_etcdir=$out/etc/dbus-1/system.d + policykit_dbus_sharedir=$out/share/dbus-1/system-services + hplip_confdir=$out/etc/hp + hplip_statedir=$out/var/lib/hp + " + ''; + + enableParallelBuilding = true; + + postInstall = stdenv.lib.optionalString withPlugin + '' + sh ${plugin} --noexec --keep + cd plugin_tmp + + cp plugin.spec $out/share/hplip/ + + mkdir -p $out/share/hplip/data/firmware + cp *.fw.gz $out/share/hplip/data/firmware + + mkdir -p $out/share/hplip/data/plugins + cp license.txt $out/share/hplip/data/plugins + + mkdir -p $out/share/hplip/prnt/plugins + for plugin in lj hbpl1; do + cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins + ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/prnt/plugins/$plugin.so + done + + mkdir -p $out/share/hplip/scan/plugins + for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do + cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins + ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/scan/plugins/$plugin.so + done + + mkdir -p $out/var/lib/hp + cp ${hplipState} $out/var/lib/hp/hplip.state + + mkdir -p $out/etc/sane.d/dll.d + mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf + + rm $out/etc/udev/rules.d/56-hpmud.rules + ''; + + fixupPhase = '' + # Wrap the user-facing Python scripts in $out/bin without turning the + # ones in $out /share into shell scripts (they need to be importable). + # Note that $out/bin contains only symlinks to $out/share. + for bin in $out/bin/*; do + py=`readlink -m $bin` + rm $bin + cp $py $bin + wrapPythonProgramsIn $bin "$out $pythonPath" + sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin + done + + # Remove originals. Knows a little too much about wrapPythonProgramsIn. + rm -f $out/bin/.*-wrapped + + # Merely patching shebangs in $out/share does not cause trouble. + for i in $out/share/hplip{,/*}/*.py; do + substituteInPlace $i \ + --replace /usr/bin/python \ + ${pythonPackages.python}/bin/${pythonPackages.python.executable} \ + --replace "/usr/bin/env python" \ + ${pythonPackages.python}/bin/${pythonPackages.python.executable} + done + + wrapPythonProgramsIn $out/lib "$out $pythonPath" + + substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out + ''; + + meta = with stdenv.lib; { + inherit version; + description = "Print, scan and fax HP drivers for Linux"; + homepage = http://hplipopensource.com/; + license = if withPlugin + then licenses.unfree + else with licenses; [ mit bsd2 gpl2Plus ]; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ jgeerds nckx ]; + }; +} diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 04ebb7a55ee..8b3676663d3 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -8,18 +8,18 @@ let - version = "3.15.9"; + version = "3.15.11"; name = "hplip-${version}"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0vcxz3gsqcamlzx61xm77h7c769ya8kdhzwafa9w2wvkf3l8zxd1"; + sha256 = "0vbw815a3wffp6l5m7j6f78xwp9pl1vn43ppyf0lp8q4vqdp3i1k"; }; plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1ahalw83xm8x0h6hljhnkknry1hny9flkrlzcymv8nmwgic0kjgs"; + sha256 = "00ii36y3914jd8zz4h6rn3xrf1w8szh1z8fngbl2qvs3qr9cm1m9"; }; hplipState = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96011a20c87..c4c9749496f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15157,6 +15157,10 @@ let hplipWithPlugin = hplip.override { withPlugin = true; }; + hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { }; + + hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; + # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; From d118e519433ac778bce6400ce2022e5e9652b15d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Nov 2015 01:43:07 +0100 Subject: [PATCH 103/157] dropbear 2015.69 -> 2015.70 Fix server password authentication on Linux, broken in 2015.69. --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index d29176876f9..6b4c1f55643 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2015.69"; + name = "dropbear-2015.70"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1j8pfpi0hjkp77b6x4vjhxfczif4qc4dk30wvxy0sahhzii56ksx"; + sha256 = "0mzj1gwamxmk8rab4xmcvldcxdvs5zczim2hdza3dwfhy4ywra32"; }; dontDisableStatic = enableStatic; From ceca397a1a999892038af5546d844041c844387c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 17 Nov 2015 21:32:00 +0100 Subject: [PATCH 104/157] dovecot: 2.2.16 -> 2.2.19 --- pkgs/servers/mail/dovecot/2.2.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index be671b7f0e7..2d38f3f5cef 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -2,14 +2,14 @@ , inotify-tools, clucene_core_2, sqlite }: stdenv.mkDerivation rec { - name = "dovecot-2.2.16"; + name = "dovecot-2.2.19"; - buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite] + buildInputs = [ perl openssl bzip2 zlib openldap clucene_core_2 sqlite ] ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "1w6gg4h9mxg3i8faqpmgj19imzyy001b0v8ihch8ma3zl63i5kjn"; + sha256 = "17sf5aancad4pg1vx1606k99389wg76blpqzmnmxlz4hklzix7km"; }; preConfigure = '' From bba0521fdd5a24bda8ce44257b1f2acba815bc7f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 19 Oct 2015 04:12:52 +0200 Subject: [PATCH 105/157] clawsMail: 3.12.0 -> 3.13.0 --- .../networking/mailreaders/claws-mail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 2c3b502e3c3..beb21546c0c 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -30,7 +30,7 @@ with stdenv.lib; -let version = "3.12.0"; in +let version = "3.13.0"; in stdenv.mkDerivation { name = "claws-mail-${version}"; @@ -40,12 +40,12 @@ stdenv.mkDerivation { homepage = http://www.claws-mail.org/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.khumba ]; + maintainers = with maintainers; [ khumba fpletz ]; }; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1jnnwivpcplv8x4w0ibb1qcnasl37fr53lbfybhgb936l2mdcai7"; + sha256 = "0fpr9gdgrs5yggm61a6135ca06x0cflddsh8dwfqmpb3dj07cl1n"; }; patches = [ ./mime.patch ]; From bfb399e3c4c5274365db6c963ed3794a79a8d480 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 19 Jul 2015 23:17:28 +0200 Subject: [PATCH 106/157] wireshark: 1.12.7 -> 2.0.0 Updates wireshark to the next major stable version. Also updated and tested the patch to search for dumpcap in PATH by @bjornfor. --- .../networking/sniffers/wireshark/default.nix | 6 +-- .../wireshark-lookup-dumpcap-in-path.patch | 41 ++++++++++--------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 65f3f256368..b49c309f5ba 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "1.12.7"; + version = "2.0.0"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "0b7rc1l1gvzcz7gfa6g7pcn32zrcfiqjx0rxm6cg3q1cwwa1qjn7"; + sha256 = "1pci4vj23wamycfj4lxxmpxps96yq6jfmqn7hdvisw4539v6q0lh"; }; buildInputs = [ @@ -70,6 +70,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ simons bjornfor ]; + maintainers = with stdenv.lib.maintainers; [ simons bjornfor fpletz ]; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch index 9c517cc0e42..35b54c79e8f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch +++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch @@ -1,6 +1,6 @@ -From 188e8858243b2278239261aaaaea7ad07476d561 Mon Sep 17 00:00:00 2001 +From 5bef9deeff8a2e4401de0f45c9701cd6f98f29d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= -Date: Sun, 13 Apr 2014 15:17:24 +0200 +Date: Thu, 26 Nov 2015 21:03:35 +0100 Subject: [PATCH] Lookup dumpcap in PATH NixOS patch: Look for dumpcap in PATH first, because there may be a @@ -10,20 +10,21 @@ non-setuid dumpcap binary. Also change execv() to execvp() because we've set argv[0] to "dumpcap" and have to enable PATH lookup. Wireshark is not a setuid program, so looking in PATH is not a security issue. ---- - capture_sync.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) -diff --git a/capture_sync.c b/capture_sync.c -index eb05fae..efb5675 100644 ---- a/capture_sync.c -+++ b/capture_sync.c -@@ -326,8 +326,18 @@ init_pipe_args(int *argc) { - argv = (char **)g_malloc(sizeof (char *)); - *argv = NULL; - -- /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */ -- exename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "dumpcap", progfile_dir); +Signed-off-by: Franz Pletz +--- + capchild/capture_sync.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c +index 970688e..49914d5 100644 +--- a/capchild/capture_sync.c ++++ b/capchild/capture_sync.c +@@ -332,7 +332,18 @@ init_pipe_args(int *argc) { + #ifdef _WIN32 + exename = g_strdup_printf("%s\\dumpcap.exe", progfile_dir); + #else +- exename = g_strdup_printf("%s/dumpcap", progfile_dir); + /* + * NixOS patch: Look for dumpcap in PATH first, because there may be a + * dumpcap setuid-wrapper that we want to use instead of the default @@ -34,12 +35,12 @@ index eb05fae..efb5675 100644 + exename = g_strdup_printf("dumpcap"); + } else { + /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */ -+ exename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "dumpcap", progfile_dir); ++ exename = g_strdup_printf("%s/dumpcap", progfile_dir); + } + #endif /* Make that the first argument in the argument list (argv[0]). */ - argv = sync_pipe_add_arg(argv, argc, exename); -@@ -649,7 +659,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi +@@ -729,7 +740,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi */ dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); @@ -48,7 +49,7 @@ index eb05fae..efb5675 100644 g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", argv[0], g_strerror(errno)); sync_pipe_errmsg_to_parent(2, errmsg, ""); -@@ -879,7 +889,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd, +@@ -997,7 +1008,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd, dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); ws_close(sync_pipe[PIPE_WRITE]); @@ -58,5 +59,5 @@ index eb05fae..efb5675 100644 argv[0], g_strerror(errno)); sync_pipe_errmsg_to_parent(2, errmsg, ""); -- -1.9.0 +2.6.3 From 1fcea37c24c5a54aa63c969d878f69f6228dcdcd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 27 Nov 2015 10:10:04 +0100 Subject: [PATCH 107/157] calibre: 2.44.1 -> 2.45.0 --- pkgs/applications/misc/calibre/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index eeff01e7ab6..a967285c941 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,12 @@ }: stdenv.mkDerivation rec { - name = "calibre-${meta.version}"; + version = "2.45.0"; + name = "calibre-${version}"; src = fetchurl { - url = "https://github.com/kovidgoyal/calibre/releases/download/v${meta.version}/${name}.tar.xz"; - sha256 = "1ffqvnjqmplcpa398809gp4d4l7nqc6k8ky255mdkabfcdvf3kk3"; + url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; + sha256 = "1s3wrrvp2d0mczs09g2xkkknvlk3max6ws7awpss5kkdpjvay6ma"; }; inherit python; @@ -58,11 +59,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - version = "2.44.1"; description = "Comprehensive e-book software"; homepage = http://calibre-ebook.com; license = licenses.gpl3; maintainers = with maintainers; [ viric iElectric pSub AndersonTorres ]; platforms = platforms.linux; + inherit version; }; } From b5e06b04a79f60e10d81812e05299e98ee7dc02b Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 26 Nov 2015 09:53:59 +0000 Subject: [PATCH 108/157] wolfssl: init at 3.7.0 Picked from #11287. --- lib/maintainers.nix | 1 + .../development/libraries/wolfssl/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/wolfssl/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 93e96b9524e..e7931b928b3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -188,6 +188,7 @@ matthiasbeyer = "Matthias Beyer "; mbakke = "Marius Bakke "; mbe = "Brandon Edens "; + mcmtroffaes = "Matthias C. M. Troffaes "; meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; michelk = "Michel Kuhlmann "; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix new file mode 100644 index 00000000000..3a6f8873b84 --- /dev/null +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "wolfssl-${version}"; + version = "3.7.0"; + + src = fetchurl { + url = "https://github.com/wolfSSL/wolfssl/archive/v${version}.tar.gz"; + sha256 = "1r1awivral4xjjvnna9lrfz2rh84rcbp04834rymbsz0kbyykgb6"; + }; + + nativeBuildInputs = [ autoconf automake libtool ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "A small, fast, portable implementation of TLS/SSL for embedded devices."; + homepage = "https://www.wolfssl.com/"; + platforms = platforms.all; + maintainers = with maintainers; [ mcmtroffaes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4c9749496f..760f3309be3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7948,6 +7948,8 @@ let boringssl = callPackage ../development/libraries/boringssl { }; + wolfssl = callPackage ../development/libraries/wolfssl { }; + openssl = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; cryptodevHeaders = linuxPackages.cryptodev.override { From ade9f7167dd1fec622c1f0ff7725cb6f6743b45d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Nov 2015 11:16:29 +0100 Subject: [PATCH 109/157] nix-prefetch-git: make sure the script is interpreted by bash Fixes https://github.com/NixOS/nixpkgs/issues/11284. --- pkgs/build-support/fetchgit/nix-prefetch-git | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 22d46257075..fbefba5ccc0 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -1,4 +1,6 @@ -#! /bin/sh -e +#! /usr/bin/env bash + +set -e -o pipefail url= rev= From 7a3b518d62b641f3a981b745d2eb8b0165e40316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 27 Nov 2015 11:44:34 +0100 Subject: [PATCH 110/157] buildPythonPackage: fix a regression #11303 --- pkgs/development/python-modules/generic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index fe62428c0b0..902dd50fbbf 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -65,6 +65,8 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // # propagate python/setuptools to active setup-hook in nix-shell propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; + pythonPath = pythonPath; + configurePhase = attrs.configurePhase or '' runHook preConfigure From a2c3c171e930b9421ed4dfc1c4ebc03e21925ad3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 26 Nov 2015 17:28:38 +0100 Subject: [PATCH 111/157] weather: init at 2.0 --- pkgs/applications/misc/weather/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/weather/default.nix diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix new file mode 100644 index 00000000000..dec18aea961 --- /dev/null +++ b/pkgs/applications/misc/weather/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgs }: + +stdenv.mkDerivation rec { + version = "2.0"; + name = "weather-${version}"; + + src = fetchurl { + url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz"; + sha256 = "0yil363y9iyr4mkd7xxq0p2260wh50f9i5p0map83k9i5l0gyyl0"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir $out/{share,man,bin} -p + cp weather{,.py} $out/bin/ + cp {airports,overrides.{conf,log},places,slist,stations,weatherrc,zctas,zlist,zones} $out/share/ + chmod +x $out/bin/weather + cp ./weather.1 $out/man/ + cp ./weatherrc.5 $out/man/ + ''; + + meta = { + homepage = "http://fungi.yuggoth.org/weather"; + description = "Quick access to current weather conditions and forecasts"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; # my only platform + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d87029b715..3347c23f6ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3363,6 +3363,8 @@ let vtun = callPackage ../tools/networking/vtun { }; + weather = callPackage ../applications/misc/weather { }; + wal_e = callPackage ../tools/backup/wal-e { }; watchman = callPackage ../development/tools/watchman { }; From dc3ec30765c0566d11d22ab60520619796d4e5e3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 27 Nov 2015 12:47:24 +0100 Subject: [PATCH 112/157] go-git-lfs: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit was failing with output ‘/nix/store/…-go1.4-git-lfs-v1.0.0-bin’ is not allowed to refer to path ‘/nix/store/…-go-1.4.3’ @nckx --- pkgs/top-level/go-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 1da66c4de11..af484c18958 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -776,11 +776,6 @@ let go generate ./commands popd ''; - - postInstall = '' - mkdir -p $bin/share - mv $bin/bin/{man,script} $bin/share - ''; }; glide = buildFromGitHub { From 34e8eea942e02a5562c2391e62fd1e5cfc154dda Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Nov 2015 07:56:11 -0500 Subject: [PATCH 113/157] Add with-packages wrapper for idris --- .../idris-modules/with-packages-wrapper.nix | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/development/idris-modules/with-packages-wrapper.nix diff --git a/pkgs/development/idris-modules/with-packages-wrapper.nix b/pkgs/development/idris-modules/with-packages-wrapper.nix new file mode 100644 index 00000000000..e55fd2c3324 --- /dev/null +++ b/pkgs/development/idris-modules/with-packages-wrapper.nix @@ -0,0 +1,38 @@ +{ stdenv, idris, packages }: stdenv.mkDerivation { + inherit (idris) name; + + inherit packages; + + unpackPhase = '' + cat >idris.c < + #include + #include + + int main (int argc, char ** argv) { + /* idris currently only supports a single library path, so respect it if the user set it */ + setenv("IDRIS_LIBRARY_PATH", "$out/lib/${idris.name}", 0); + execv("${idris}/bin/idris", argv); + perror("executing ${idris}/bin/idris"); + return 127; + } + EOF + ''; + + buildPhase = '' + gcc -O3 -o idris idris.c + ''; + + installPhase = '' + mkdir -p $out/lib/${idris.name} + for package in $packages + do + ln -sv $package/lib/${idris.name}/* $out/lib/${idris.name} + done + + mkdir -p $out/bin + mv idris $out/bin + ''; + + stripAllList = [ "bin" ]; +} From 5898c2060433d803865df3a9af4408d0443de8b8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Nov 2015 08:19:50 -0500 Subject: [PATCH 114/157] Add idrisPackages to all-packages.nix --- pkgs/development/idris-modules/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/idris-modules/default.nix diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix new file mode 100644 index 00000000000..d07619724fe --- /dev/null +++ b/pkgs/development/idris-modules/default.nix @@ -0,0 +1,18 @@ +{ pkgs, idris, overrides ? (self: super: {}) }: let + inherit (pkgs.lib) callPackageWith fix' extends; + + /* Taken from haskell-modules/default.nix, should probably abstract this away */ + callPackageWithScope = scope: drv: args: (callPackageWith scope drv args) // { + overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; + }; + + mkScope = scope : pkgs // pkgs.xorg // pkgs.gnome // scope; + + idrisPackages = self: let + defaultScope = mkScope self; + + callPackage = callPackageWithScope defaultScope; + in { + withPackages = packages: callPackage ./with-packages-wrapper.nix { inherit packages idris; }; + }; +in fix' (extends overrides idrisPackages) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 760f3309be3..f482a74881c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4121,6 +4121,8 @@ let icedtea_web = icedtea8_web; + idrisPackages = callPackage ../development/idris-modules { inherit (haskellPackages) idris; }; + ikarus = callPackage ../development/compilers/ikarus { }; intercal = callPackage ../development/compilers/intercal { }; From efbee054fd2dca2b14c729cf73aca7246c56d9f2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Nov 2015 09:35:59 -0500 Subject: [PATCH 115/157] Add builtin idris packages to idrisPackages --- .../idris-modules/build-builtin-package.nix | 12 +++++++ .../idris-modules/build-idris-package.nix | 34 +++++++++++++++++++ pkgs/development/idris-modules/default.nix | 24 +++++++++++-- .../idris-modules/with-packages-wrapper.nix | 22 +++++++----- 4 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/idris-modules/build-builtin-package.nix create mode 100644 pkgs/development/idris-modules/build-idris-package.nix diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix new file mode 100644 index 00000000000..9a6b99d1523 --- /dev/null +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -0,0 +1,12 @@ +{ idris, buildIdrisPackage }: name: deps: buildIdrisPackage (args: { + inherit name; + + propagatedBuildInputs = deps; + + inherit (idris) src; + + postUnpack = '' + mv $sourceRoot/libs/${name} $IDRIS_LIBRARY_PATH + sourceRoot=$IDRIS_LIBRARY_PATH/${name} + ''; +}) diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix new file mode 100644 index 00000000000..eecd7d585cf --- /dev/null +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -0,0 +1,34 @@ +{ stdenv, idris }: argf: let args = { + preHook = '' + mkdir idris-libs + export IDRIS_LIBRARY_PATH=$PWD/idris-libs + + addIdrisLibs () { + if [ -d $1/lib/${idris.name} ]; then + ln -sv $1/lib/${idris.name}/* $IDRIS_LIBRARY_PATH + fi + } + + envHooks+=(addIdrisLibs) + ''; + + configurePhase = '' + export TARGET=$out/lib/${idris.name} + ''; + + buildPhase = '' + ${idris}/bin/idris --build *.ipkg + ''; + + doCheck = true; + + checkPhase = '' + if grep -q test *.ipkg; then + ${idris}/bin/idris --testpkg *.ipkg + fi + ''; + + installPhase = '' + ${idris}/bin/idris --install *.ipkg + ''; +}; in stdenv.mkDerivation (args // (argf args)) diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index d07619724fe..96e8b5b8ad9 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -12,7 +12,27 @@ defaultScope = mkScope self; callPackage = callPackageWithScope defaultScope; + + buildBuiltinPackage = callPackage ./build-builtin-package.nix {}; + + builtins = pkgs.lib.mapAttrs buildBuiltinPackage { + prelude = []; + + base = [ self.prelude ]; + + contrib = [ self.prelude self.base ]; + + effects = [ self.prelude self.base ]; + + pruviloj = [ self.prelude self.base ]; + }; in { - withPackages = packages: callPackage ./with-packages-wrapper.nix { inherit packages idris; }; - }; + inherit idris; + + withPackages = callPackage ./with-packages-wrapper.nix {}; + + buildIdrisPackage = callPackage ./build-idris-package.nix {}; + + builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins; + } // builtins; in fix' (extends overrides idrisPackages) diff --git a/pkgs/development/idris-modules/with-packages-wrapper.nix b/pkgs/development/idris-modules/with-packages-wrapper.nix index e55fd2c3324..f8abe09fe87 100644 --- a/pkgs/development/idris-modules/with-packages-wrapper.nix +++ b/pkgs/development/idris-modules/with-packages-wrapper.nix @@ -1,7 +1,19 @@ -{ stdenv, idris, packages }: stdenv.mkDerivation { +{ stdenv, idris }: buildInputs: stdenv.mkDerivation { inherit (idris) name; - inherit packages; + inherit buildInputs; + + preHook = '' + mkdir -p $out/lib/${idris.name} + + installIdrisLib () { + if [ -d $1/lib/${idris.name} ]; then + ln -sv $1/lib/${idris.name}/* $out/lib/${idris.name} + fi + } + + envHooks+=(installIdrisLib) + ''; unpackPhase = '' cat >idris.c < Date: Fri, 27 Nov 2015 09:55:22 -0500 Subject: [PATCH 116/157] idris-modules: Read the filesystem to populate package list --- .../idris-modules/build-builtin-package.nix | 2 +- pkgs/development/idris-modules/default.nix | 18 ++++++++---------- ...-packages-wrapper.nix => with-packages.nix} | 0 3 files changed, 9 insertions(+), 11 deletions(-) rename pkgs/development/idris-modules/{with-packages-wrapper.nix => with-packages.nix} (100%) diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 9a6b99d1523..7445e95e27c 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,4 +1,4 @@ -{ idris, buildIdrisPackage }: name: deps: buildIdrisPackage (args: { +{ idris, build-idris-package }: name: deps: build-idris-package (args: { inherit name; propagatedBuildInputs = deps; diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 96e8b5b8ad9..8388eb96bbf 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -13,9 +13,7 @@ callPackage = callPackageWithScope defaultScope; - buildBuiltinPackage = callPackage ./build-builtin-package.nix {}; - - builtins = pkgs.lib.mapAttrs buildBuiltinPackage { + builtins_ = pkgs.lib.mapAttrs self.build-builtin-package { prelude = []; base = [ self.prelude ]; @@ -26,13 +24,13 @@ pruviloj = [ self.prelude self.base ]; }; - in { - inherit idris; - withPackages = callPackage ./with-packages-wrapper.nix {}; + files = builtins.filter (n: n != null) (pkgs.lib.mapAttrsToList (name: type: let + m = builtins.match "(.*)\.nix" name; + in if m == null then null else builtins.head m) (builtins.readDir ./.)); + in (builtins.listToAttrs (map (name: { inherit name; value = callPackage (./. + "/${name}.nix") {}; }) files)) // { + inherit idris callPackage; - buildIdrisPackage = callPackage ./build-idris-package.nix {}; - - builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins; - } // builtins; + builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_; + } // builtins_; in fix' (extends overrides idrisPackages) diff --git a/pkgs/development/idris-modules/with-packages-wrapper.nix b/pkgs/development/idris-modules/with-packages.nix similarity index 100% rename from pkgs/development/idris-modules/with-packages-wrapper.nix rename to pkgs/development/idris-modules/with-packages.nix From a01c7b5a1525d333c29a05e61bcb249c934ccbf6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Nov 2015 09:57:49 -0500 Subject: [PATCH 117/157] idris-modules: Filter out default.nix --- pkgs/development/idris-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 8388eb96bbf..da879fa6cf4 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -25,9 +25,9 @@ pruviloj = [ self.prelude self.base ]; }; - files = builtins.filter (n: n != null) (pkgs.lib.mapAttrsToList (name: type: let + files = builtins.filter (n: n != "default") (pkgs.lib.mapAttrsToList (name: type: let m = builtins.match "(.*)\.nix" name; - in if m == null then null else builtins.head m) (builtins.readDir ./.)); + in if m == null then "default" else builtins.head m) (builtins.readDir ./.)); in (builtins.listToAttrs (map (name: { inherit name; value = callPackage (./. + "/${name}.nix") {}; }) files)) // { inherit idris callPackage; From dc164dc2eebf014759a6ef7cccb4febc891390d2 Mon Sep 17 00:00:00 2001 From: Fabian Schmitthenner Date: Fri, 27 Nov 2015 07:55:56 +0000 Subject: [PATCH 118/157] system for automated deduction: init at 2.3-25 --- .../science/logic/sad/default.nix | 33 +++ pkgs/applications/science/logic/sad/patch | 200 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 235 insertions(+) create mode 100644 pkgs/applications/science/logic/sad/default.nix create mode 100644 pkgs/applications/science/logic/sad/patch diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix new file mode 100644 index 00000000000..d9d36b99117 --- /dev/null +++ b/pkgs/applications/science/logic/sad/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, ghc, spass }: + +stdenv.mkDerivation { + name = "system-for-automated-deduction-2.3.25"; + src = fetchurl { + url = "http://nevidal.org/download/sad-2.3-25.tar.gz"; + sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; + }; + buildInputs = [ ghc spass ]; + patches = [ ./patch ]; + postPatch = '' + substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt + ''; + installPhase = '' + mkdir -p $out/{bin,provers} + install alice $out/bin + install provers/moses $out/provers + substituteAll provers/provers.dat $out/provers/provers.dat + substituteAll init.opt $out/init.opt + cp -r examples $out + ''; + inherit spass; + meta = { + description = "A program for automated proving of mathematical texts"; + longDescription = '' + The system for automated deduction is intended for automated processing of formal mathematical texts + written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language + ''; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.schmitthenner ]; + homepage = http://nevidal.org/sad.en.html; + }; +} diff --git a/pkgs/applications/science/logic/sad/patch b/pkgs/applications/science/logic/sad/patch new file mode 100644 index 00000000000..a5b1d617708 --- /dev/null +++ b/pkgs/applications/science/logic/sad/patch @@ -0,0 +1,200 @@ +diff -aur serious/sad-2.3-25/Alice/Core/Base.hs sad-2.3-25/Alice/Core/Base.hs +--- serious/sad-2.3-25/Alice/Core/Base.hs 2008-03-29 18:24:12.000000000 +0000 ++++ sad-2.3-25/Alice/Core/Base.hs 2015-11-27 06:38:28.740840823 +0000 +@@ -21,6 +21,7 @@ + module Alice.Core.Base where + + import Control.Monad ++import Control.Applicative + import Data.IORef + import Data.List + import Data.Time +@@ -61,10 +62,21 @@ + type CRMC a b = IORef RState -> IO a -> (b -> IO a) -> IO a + newtype CRM b = CRM { runCRM :: forall a . CRMC a b } + ++instance Functor CRM where ++ fmap = liftM ++ ++instance Applicative CRM where ++ pure = return ++ (<*>) = ap ++ + instance Monad CRM where + return r = CRM $ \ _ _ k -> k r + m >>= n = CRM $ \ s z k -> runCRM m s z (\ r -> runCRM (n r) s z k) + ++instance Alternative CRM where ++ (<|>) = mplus ++ empty = mzero ++ + instance MonadPlus CRM where + mzero = CRM $ \ _ z _ -> z + mplus m n = CRM $ \ s z k -> runCRM m s (runCRM n s z k) k +diff -aur serious/sad-2.3-25/Alice/Core/Thesis.hs sad-2.3-25/Alice/Core/Thesis.hs +--- serious/sad-2.3-25/Alice/Core/Thesis.hs 2008-03-05 13:10:50.000000000 +0000 ++++ sad-2.3-25/Alice/Core/Thesis.hs 2015-11-27 06:35:08.311015166 +0000 +@@ -21,6 +21,7 @@ + module Alice.Core.Thesis (thesis) where + + import Control.Monad ++import Control.Applicative + import Data.List + import Data.Maybe + +@@ -126,11 +127,22 @@ + + newtype TM res = TM { runTM :: [String] -> [([String], res)] } + ++instance Functor TM where ++ fmap = liftM ++ ++instance Applicative TM where ++ pure = return ++ (<*>) = ap ++ + instance Monad TM where + return r = TM $ \ s -> [(s, r)] + m >>= k = TM $ \ s -> concatMap apply (runTM m s) + where apply (s, r) = runTM (k r) s + ++instance Alternative TM where ++ (<|>) = mplus ++ empty = mzero ++ + instance MonadPlus TM where + mzero = TM $ \ _ -> [] + mplus m k = TM $ \ s -> runTM m s ++ runTM k s +diff -aur serious/sad-2.3-25/Alice/Export/Base.hs sad-2.3-25/Alice/Export/Base.hs +--- serious/sad-2.3-25/Alice/Export/Base.hs 2008-03-09 09:36:39.000000000 +0000 ++++ sad-2.3-25/Alice/Export/Base.hs 2015-11-27 06:32:47.782738005 +0000 +@@ -39,7 +39,7 @@ + -- Database reader + + readPrDB :: String -> IO [Prover] +-readPrDB file = do inp <- catch (readFile file) $ die . ioeGetErrorString ++readPrDB file = do inp <- catchIOError (readFile file) $ die . ioeGetErrorString + + let dws = dropWhile isSpace + cln = reverse . dws . reverse . dws +diff -aur serious/sad-2.3-25/Alice/Export/Prover.hs sad-2.3-25/Alice/Export/Prover.hs +--- serious/sad-2.3-25/Alice/Export/Prover.hs 2008-03-09 09:36:39.000000000 +0000 ++++ sad-2.3-25/Alice/Export/Prover.hs 2015-11-27 06:36:47.632919161 +0000 +@@ -60,7 +60,7 @@ + when (askIB IBPdmp False ins) $ putStrLn tsk + + seq (length tsk) $ return $ +- do (wh,rh,eh,ph) <- catch run ++ do (wh,rh,eh,ph) <- catchIOError run + $ \ e -> die $ "run error: " ++ ioeGetErrorString e + + hPutStrLn wh tsk ; hClose wh +diff -aur serious/sad-2.3-25/Alice/ForTheL/Base.hs sad-2.3-25/Alice/ForTheL/Base.hs +--- serious/sad-2.3-25/Alice/ForTheL/Base.hs 2008-03-09 09:36:39.000000000 +0000 ++++ sad-2.3-25/Alice/ForTheL/Base.hs 2015-11-27 06:31:51.921230428 +0000 +@@ -226,7 +226,7 @@ + varlist = do vs <- chainEx (char ',') var + nodups vs ; return vs + +-nodups vs = unless (null $ dups vs) $ ++nodups vs = unless ((null :: [a] -> Bool) $ dups vs) $ + fail $ "duplicate names: " ++ show vs + + hidden = askPS psOffs >>= \ n -> return ('h':show n) +diff -aur serious/sad-2.3-25/Alice/Import/Reader.hs sad-2.3-25/Alice/Import/Reader.hs +--- serious/sad-2.3-25/Alice/Import/Reader.hs 2008-03-09 09:36:39.000000000 +0000 ++++ sad-2.3-25/Alice/Import/Reader.hs 2015-11-27 06:36:41.818866167 +0000 +@@ -24,7 +24,7 @@ + import Control.Monad + import System.IO + import System.IO.Error +-import System.Exit ++import System.Exit hiding (die) + + import Alice.Data.Text + import Alice.Data.Instr +@@ -44,7 +44,7 @@ + readInit "" = return [] + + readInit file = +- do input <- catch (readFile file) $ die file . ioeGetErrorString ++ do input <- catchIOError (readFile file) $ die file . ioeGetErrorString + let tkn = tokenize input ; ips = initPS () + inp = ips { psRest = tkn, psFile = file, psLang = "Init" } + liftM fst $ fireLPM instf inp +@@ -74,7 +74,7 @@ + reader lb fs (ps:ss) [TI (InStr ISfile file)] = + do let gfl = if null file then hGetContents stdin + else readFile file +- input <- catch gfl $ die file . ioeGetErrorString ++ input <- catchIOError gfl $ die file . ioeGetErrorString + let tkn = tokenize input + ips = initPS $ (psProp ps) { tvr_expr = [] } + sps = ips { psRest = tkn, psFile = file, psOffs = psOffs ps } +diff -aur serious/sad-2.3-25/Alice/Parser/Base.hs sad-2.3-25/Alice/Parser/Base.hs +--- serious/sad-2.3-25/Alice/Parser/Base.hs 2008-03-09 09:36:40.000000000 +0000 ++++ sad-2.3-25/Alice/Parser/Base.hs 2015-11-27 06:14:28.616734527 +0000 +@@ -20,6 +20,7 @@ + + module Alice.Parser.Base where + ++import Control.Applicative + import Control.Monad + import Data.List + +@@ -45,11 +46,22 @@ + type CPMC a b c = (c -> CPMS a b) -> (String -> CPMS a b) -> CPMS a b + newtype CPM a c = CPM { runCPM :: forall b . CPMC a b c } + ++instance Functor (CPM a) where ++ fmap = liftM ++ ++instance Applicative (CPM a) where ++ pure = return ++ (<*>) = ap ++ + instance Monad (CPM a) where + return r = CPM $ \ k _ -> k r + m >>= n = CPM $ \ k l -> runCPM m (\ b -> runCPM (n b) k l) l + fail e = CPM $ \ _ l -> l e + ++instance Alternative (CPM a) where ++ (<|>) = mplus ++ empty = mzero ++ + instance MonadPlus (CPM a) where + mzero = CPM $ \ _ _ _ z -> z + mplus m n = CPM $ \ k l s -> runCPM m k l s . runCPM n k l s +diff -aur serious/sad-2.3-25/init.opt sad-2.3-25/init.opt +--- serious/sad-2.3-25/init.opt 2007-10-11 15:25:45.000000000 +0000 ++++ sad-2.3-25/init.opt 2015-11-27 07:23:41.372816854 +0000 +@@ -1,6 +1,6 @@ + # Alice init options +-[library examples] +-[provers provers/provers.dat] ++[library @out@/examples] ++[provers @out@/provers/provers.dat] + [prover spass] + [timelimit 3] + [depthlimit 7] +diff -aur serious/sad-2.3-25/provers/provers.dat sad-2.3-25/provers/provers.dat +--- serious/sad-2.3-25/provers/provers.dat 2008-08-26 21:20:25.000000000 +0000 ++++ sad-2.3-25/provers/provers.dat 2015-11-27 07:24:18.878169702 +0000 +@@ -3,7 +3,7 @@ + Pmoses + LMoses + Fmoses +-Cprovers/moses ++C@out@/provers/moses + Yproved in + Nfound unprovable in + Utimeout in +@@ -12,7 +12,7 @@ + Pspass + LSPASS + Fdfg +-Cprovers/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d ++C@spass@/bin/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d + YSPASS beiseite: Proof found. + NSPASS beiseite: Completion found. + USPASS beiseite: Ran out of time. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddf2f907ebc..892bbd55df1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8207,6 +8207,8 @@ let rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; + + sad = callPackage ../applications/science/logic/sad { }; sbc = callPackage ../development/libraries/sbc { }; From 0dce60b34d8fefa02904debc9e6d427a6cb7d459 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Nov 2015 11:03:04 -0500 Subject: [PATCH 119/157] Add wl-pprint Idris package. --- .../development/idris-modules/build-idris-package.nix | 4 +++- pkgs/development/idris-modules/wl-pprint.nix | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/idris-modules/wl-pprint.nix diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index eecd7d585cf..d3686b2a293 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -1,4 +1,4 @@ -{ stdenv, idris }: argf: let args = { +{ stdenv, idris, gmp }: argf: let args = { preHook = '' mkdir idris-libs export IDRIS_LIBRARY_PATH=$PWD/idris-libs @@ -31,4 +31,6 @@ installPhase = '' ${idris}/bin/idris --install *.ipkg ''; + + buildInputs = [ gmp ]; }; in stdenv.mkDerivation (args // (argf args)) diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix new file mode 100644 index 00000000000..dfde08fceab --- /dev/null +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -0,0 +1,11 @@ +{ build-idris-package, fetchgit, prelude, base }: build-idris-package (args : { + name = "wl-pprint"; + + src = fetchgit { + url = "git://github.com/shayan-najd/wl-pprint.git"; + rev = "120f654b0b9838b57e10b163d3562d959439fb07"; + sha256 = "b5d02a9191973dd8915279e84a9b4df430eb252f429327f45eb8a047d8bb954d"; + }; + + propagatedBuildInputs = [ prelude base ]; +}) From 6496a6e115408782c42c786f69ac84c465f91af4 Mon Sep 17 00:00:00 2001 From: wedens Date: Fri, 27 Nov 2015 22:42:59 +0600 Subject: [PATCH 120/157] font-awesome-ttf: 4.4.0 -> 4.5.0 --- pkgs/data/fonts/font-awesome-ttf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index c8266ca534b..284416ad629 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "font-awesome-4.4.0"; + name = "font-awesome-4.5.0"; src = fetchurl { url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip"; - sha256 = "1k7ff71pcp2qrnqj4yzrjg96m7yma9r58wdk68sqb93q2kq9fp3i"; + sha256 = "1lvxs4isrk80cczq6nrxksvqxs04k13i23i6c2l5vmfs2ndjsdm2"; }; buildCommand = '' From 94a109c0c94154a2c7fee6a5115fe2ed1d0dd144 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Thu, 26 Nov 2015 09:43:42 -0800 Subject: [PATCH 121/157] go-mode: init at 20150817 --- pkgs/top-level/emacs-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index e10262cd5e8..98da54879f3 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -954,6 +954,21 @@ let self = _self // overrides; }; }; + go-mode = melpaBuild rec { + pname = "go-mode"; + version = "20150817"; + src = fetchFromGitHub { + owner = "dominikh"; + repo = "go-mode.el"; + rev = "5d53a13bd193653728e74102c81aa931b780c9a9"; + sha256 = "0hvssmvzvn13j18282nsq8fclyjs0x103gj9bp6fhmzxmzl56l7g"; + }; + meta = { + description = "Go language support for Emacs"; + license = bsd3; + }; + }; + god-mode = melpaBuild rec { pname = "god-mode"; version = "20140811"; From a8abf054eefa864a87675da49219db3663237f13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Nov 2015 18:58:23 +0100 Subject: [PATCH 122/157] goPackages.git-lfs: remove `man` and `script` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After dc3ec30 these are back in $PATH where they don't belong. Just remove them ‘for now’. (`postInstall` seems to have been modified in the gap between 741bf84, where those files were simply removed, and 6602f49.) --- pkgs/top-level/go-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index af484c18958..d33b4f8f358 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -776,6 +776,10 @@ let go generate ./commands popd ''; + + postInstall = '' + rm -v $bin/bin/{man,script} + ''; }; glide = buildFromGitHub { From 0f90c9dbc1a42430883ab31853ba25e9d9ec26a5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Nov 2015 13:17:17 -0500 Subject: [PATCH 123/157] idris-modules: documentation --- .../idris-modules/build-builtin-package.nix | 11 ++++++++-- .../idris-modules/build-idris-package.nix | 8 ++++++-- pkgs/development/idris-modules/default.nix | 7 ++++++- .../idris-modules/with-packages.nix | 6 ++++-- pkgs/development/idris-modules/wl-pprint.nix | 20 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 6 files changed, 46 insertions(+), 10 deletions(-) diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 7445e95e27c..95641a8f9fa 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,4 +1,7 @@ -{ idris, build-idris-package }: name: deps: build-idris-package (args: { +# Build one of the packages that come with idris +# name: The name of the package +# deps: The dependencies of the package +{ idris, build-idris-package, lib }: name: deps: build-idris-package { inherit name; propagatedBuildInputs = deps; @@ -9,4 +12,8 @@ mv $sourceRoot/libs/${name} $IDRIS_LIBRARY_PATH sourceRoot=$IDRIS_LIBRARY_PATH/${name} ''; -}) + + meta = idris.meta // { + description = "${name} builtin Idris library"; + }; +} diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index d3686b2a293..a00f5e74b84 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -1,4 +1,8 @@ -{ stdenv, idris, gmp }: argf: let args = { +# Build an idris package +# +# args: Additional arguments to pass to mkDerivation. Generally should include at least +# name and src. +{ stdenv, idris, gmp }: args: stdenv.mkDerivation ({ preHook = '' mkdir idris-libs export IDRIS_LIBRARY_PATH=$PWD/idris-libs @@ -33,4 +37,4 @@ ''; buildInputs = [ gmp ]; -}; in stdenv.mkDerivation (args // (argf args)) +} // args) diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index da879fa6cf4..95ab68c5f42 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -28,9 +28,14 @@ files = builtins.filter (n: n != "default") (pkgs.lib.mapAttrsToList (name: type: let m = builtins.match "(.*)\.nix" name; in if m == null then "default" else builtins.head m) (builtins.readDir ./.)); - in (builtins.listToAttrs (map (name: { inherit name; value = callPackage (./. + "/${name}.nix") {}; }) files)) // { + in (builtins.listToAttrs (map (name: { + inherit name; + + value = callPackage (./. + "/${name}.nix") {}; + }) files)) // { inherit idris callPackage; + # A list of all of the libraries that come with idris builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_; } // builtins_; in fix' (extends overrides idrisPackages) diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index f8abe09fe87..edcd20c1097 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -1,7 +1,9 @@ -{ stdenv, idris }: buildInputs: stdenv.mkDerivation { +# Build a version of idris with a set of packages visible +# packages: The packages visible to idris +{ stdenv, idris }: packages: stdenv.mkDerivation { inherit (idris) name; - inherit buildInputs; + buildInputs = packages; preHook = '' mkdir -p $out/lib/${idris.name} diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index dfde08fceab..2bf5ef79253 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -1,4 +1,10 @@ -{ build-idris-package, fetchgit, prelude, base }: build-idris-package (args : { +{ build-idris-package +, fetchgit +, prelude +, base +, lib +, idris +}: build-idris-package { name = "wl-pprint"; src = fetchgit { @@ -8,4 +14,14 @@ }; propagatedBuildInputs = [ prelude base ]; -}) + + meta = { + description = "Wadler-Leijen pretty-printing library"; + + homepage = https://github.com/shayan-najd/wl-pprint; + + license = lib.licenses.bsd2; + + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f482a74881c..1f647c712f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4121,7 +4121,9 @@ let icedtea_web = icedtea8_web; - idrisPackages = callPackage ../development/idris-modules { inherit (haskellPackages) idris; }; + idrisPackages = callPackage ../development/idris-modules { + inherit (haskellPackages) idris; + }; ikarus = callPackage ../development/compilers/ikarus { }; From 9562549ff25033a8ef1ff3906079ec874bb5c67b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Nov 2015 13:34:38 -0500 Subject: [PATCH 124/157] idris-modules: Add docs --- pkgs/development/idris-modules/README.md | 39 ++++++++++++++++++++++++ pkgs/development/idris-modules/TODO.md | 3 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/idris-modules/README.md create mode 100644 pkgs/development/idris-modules/TODO.md diff --git a/pkgs/development/idris-modules/README.md b/pkgs/development/idris-modules/README.md new file mode 100644 index 00000000000..005ed360285 --- /dev/null +++ b/pkgs/development/idris-modules/README.md @@ -0,0 +1,39 @@ +Idris packages +============== + +This directory contains build rules for idris packages. In addition, +it contains several functions to build and compose those packages. +Everything is exposed to the user via the `idrisPackages` attribute. + +callPackage +------------ + +This is like the normal nixpkgs callPackage function, specialized to +idris packages. + +builtins +--------- + +This is a list of all of the libraries that come packaged with Idris +itself. + +build-idris-package +-------------------- + +A function to build an idris package. Its sole argument is a set like +you might pass to `stdenv.mkDerivation`, except `build-idris-package` +sets several attributes for you. See `build-idris-package.nix` for +details. + +build-builtin-package +---------------------- + +A version of `build-idris-package` specialized to builtin libraries. +Mostly for internal use. + +with-packages +------------- + +Bundle idris together with a list of packages. Because idris currently +only supports a single directory in its library path, you must include +all desired libraries here, including `prelude` and `base`. \ No newline at end of file diff --git a/pkgs/development/idris-modules/TODO.md b/pkgs/development/idris-modules/TODO.md new file mode 100644 index 00000000000..4dcaa61829a --- /dev/null +++ b/pkgs/development/idris-modules/TODO.md @@ -0,0 +1,3 @@ +* Build the RTS separately from Idris +* idris2nix +* Only require gmp, rts when compiling executables \ No newline at end of file From 2de0dc1a185a2e36cc7c388852a98897f94e00cd Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 27 Nov 2015 21:36:47 +0100 Subject: [PATCH 125/157] statsd: updated package and nixos service * package statsd node packages separatly since they actually require nodejs-0.10 or nodejs-0.12 to work (which is ... well old) * remove statsd packages and its backends from "global" node-packages.json. i did not rebuild it since for some reason npm2nix command fails. next time somebody will rerun npm2nix statsd packages are going to be removed. * statsd service: backends are now provided as strings and not anymore as packages. --- nixos/modules/services/monitoring/statsd.nix | 31 ++- pkgs/tools/networking/statsd/default.nix | 13 + .../networking/statsd/node-packages.json | 6 + .../tools/networking/statsd/node-packages.nix | 244 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + pkgs/top-level/node-packages.json | 4 - 6 files changed, 291 insertions(+), 11 deletions(-) create mode 100644 pkgs/tools/networking/statsd/default.nix create mode 100644 pkgs/tools/networking/statsd/node-packages.json create mode 100644 pkgs/tools/networking/statsd/node-packages.nix diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index d9e0b83e238..39fabc27d6c 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -6,13 +6,21 @@ let cfg = config.services.statsd; + isBuiltinBackend = name: + builtins.elem name [ "graphite" "console" "repeater" ]; + configFile = pkgs.writeText "statsd.conf" '' { address: "${cfg.host}", port: "${toString cfg.port}", mgmt_address: "${cfg.mgmt_address}", mgmt_port: "${toString cfg.mgmt_port}", - backends: [${concatMapStringsSep "," (el: if (nixType el) == "string" then ''"./backends/${el}"'' else ''"${head el.names}"'') cfg.backends}], + backends: [${ + concatMapStringsSep "," (name: + if (isBuiltinBackend name) + then ''"./backends/${name}"'' + else ''"${name}"'' + ) cfg.backends}], ${optionalString (cfg.graphiteHost!=null) ''graphiteHost: "${cfg.graphiteHost}",''} ${optionalString (cfg.graphitePort!=null) ''graphitePort: "${toString cfg.graphitePort}",''} console: { @@ -66,9 +74,16 @@ in backends = mkOption { description = "List of backends statsd will use for data persistence"; - default = ["graphite"]; - example = ["graphite" pkgs.nodePackages."statsd-influxdb-backend"]; - type = types.listOf (types.either types.str types.package); + default = []; + example = [ + "graphite" + "console" + "repeater" + "statsd-librato-backend" + "stackdriver-statsd-backend" + "statsd-influxdb-backend" + ]; + type = types.listOf types.str; }; graphiteHost = mkOption { @@ -105,15 +120,17 @@ in description = "Statsd Server"; wantedBy = [ "multi-user.target" ]; environment = { - NODE_PATH=concatMapStringsSep ":" (el: "${el}/lib/node_modules") (filter (el: (nixType el) != "string") cfg.backends); + NODE_PATH=concatMapStringsSep ":" + (pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules") + (filter (name: !isBuiltinBackend name) cfg.backends); }; serviceConfig = { - ExecStart = "${pkgs.nodePackages.statsd}/bin/statsd ${configFile}"; + ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}"; User = "statsd"; }; }; - environment.systemPackages = [pkgs.nodePackages.statsd]; + environment.systemPackages = [ pkgs.statsd ]; }; diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix new file mode 100644 index 00000000000..1143d55269f --- /dev/null +++ b/pkgs/tools/networking/statsd/default.nix @@ -0,0 +1,13 @@ +{ recurseIntoAttrs, callPackage, nodejs +}: + +let + self = recurseIntoAttrs ( + callPackage { + inherit nodejs self; + generated = callPackage ./node-packages.nix { inherit self; }; + overrides = { + "statsd" = { passthru.nodePackages = self; }; + }; + }); +in self.statsd diff --git a/pkgs/tools/networking/statsd/node-packages.json b/pkgs/tools/networking/statsd/node-packages.json new file mode 100644 index 00000000000..f75224e79f9 --- /dev/null +++ b/pkgs/tools/networking/statsd/node-packages.json @@ -0,0 +1,6 @@ +[ + "statsd" +, "statsd-librato-backend" +, "stackdriver-statsd-backend" +, "statsd-influxdb-backend" +] diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix new file mode 100644 index 00000000000..6cf9e8478d7 --- /dev/null +++ b/pkgs/tools/networking/statsd/node-packages.nix @@ -0,0 +1,244 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."commander"."1.3.1" = + self.by-version."commander"."1.3.1"; + by-version."commander"."1.3.1" = self.buildNodePackage { + name = "commander-1.3.1"; + version = "1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; + name = "commander-1.3.1.tgz"; + sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; + }; + deps = { + "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connection-parse"."0.0.x" = + self.by-version."connection-parse"."0.0.7"; + by-version."connection-parse"."0.0.7" = self.buildNodePackage { + name = "connection-parse-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + name = "connection-parse-0.0.7.tgz"; + sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hashring"."1.0.1" = + self.by-version."hashring"."1.0.1"; + by-version."hashring"."1.0.1" = self.buildNodePackage { + name = "hashring-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz"; + name = "hashring-1.0.1.tgz"; + sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c"; + }; + deps = { + "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7"; + "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."keypress"."0.1.x" = + self.by-version."keypress"."0.1.0"; + by-version."keypress"."0.1.0" = self.buildNodePackage { + name = "keypress-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + name = "keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-syslog"."1.1.7" = + self.by-version."node-syslog"."1.1.7"; + by-version."node-syslog"."1.1.7" = self.buildNodePackage { + name = "node-syslog-1.1.7"; + version = "1.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz"; + name = "node-syslog-1.1.7.tgz"; + sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sequence"."2.2.1" = + self.by-version."sequence"."2.2.1"; + by-version."sequence"."2.2.1" = self.buildNodePackage { + name = "sequence-2.2.1"; + version = "2.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + name = "sequence-2.2.1.tgz"; + sha1 = "7f5617895d44351c0a047e764467690490a16b03"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."simple-lru-cache"."0.0.x" = + self.by-version."simple-lru-cache"."0.0.2"; + by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { + name = "simple-lru-cache-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + name = "simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stackdriver-statsd-backend"."*" = + self.by-version."stackdriver-statsd-backend"."0.2.3"; + by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage { + name = "stackdriver-statsd-backend-0.2.3"; + version = "0.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; + name = "stackdriver-statsd-backend-0.2.3.tgz"; + sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3"; + by-spec."statsd"."*" = + self.by-version."statsd"."0.7.2"; + by-version."statsd"."0.7.2" = self.buildNodePackage { + name = "statsd-0.7.2"; + version = "0.7.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz"; + name = "statsd-0.7.2.tgz"; + sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e"; + }; + deps = { + }; + optionalDependencies = { + "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7"; + "hashring-1.0.1" = self.by-version."hashring"."1.0.1"; + "winser-0.1.6" = self.by-version."winser"."0.1.6"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "statsd" = self.by-version."statsd"."0.7.2"; + by-spec."statsd-influxdb-backend"."*" = + self.by-version."statsd-influxdb-backend"."0.6.0"; + by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage { + name = "statsd-influxdb-backend-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; + name = "statsd-influxdb-backend-0.6.0.tgz"; + sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.6.0"; + by-spec."statsd-librato-backend"."*" = + self.by-version."statsd-librato-backend"."0.1.7"; + by-version."statsd-librato-backend"."0.1.7" = self.buildNodePackage { + name = "statsd-librato-backend-0.1.7"; + version = "0.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz"; + name = "statsd-librato-backend-0.1.7.tgz"; + sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.7"; + by-spec."winser"."=0.1.6" = + self.by-version."winser"."0.1.6"; + by-version."winser"."0.1.6" = self.buildNodePackage { + name = "winser-0.1.6"; + version = "0.1.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; + name = "winser-0.1.6.tgz"; + sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; + }; + deps = { + "sequence-2.2.1" = self.by-version."sequence"."2.2.1"; + "commander-1.3.1" = self.by-version."commander"."1.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a81815d8ba0..2540305a3d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12983,6 +12983,10 @@ let stella = callPackage ../misc/emulators/stella { }; + statsd = callPackage ../tools/networking/statsd { + nodejs = nodejs-0_10; + }; + linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 11fd19af29b..d056a98bb86 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -66,10 +66,6 @@ , "flatiron" , "ironhorse" , "fs-walk" -, { "statsd": "https://github.com/etsy/statsd/tarball/23b331895cc4b22b64a19fd0e7b6def6f6f30d9e"} -, "statsd-librato-backend" -, "stackdriver-statsd-backend" -, "statsd-influxdb-backend" , "ungit" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } From ee07543ccd9422a82b248d283946c75a72003a81 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 27 Nov 2015 20:49:26 +0100 Subject: [PATCH 126/157] stdenv: `licenseAllowed` -> `checkValidity` Rename and make it a true function (that can be re-used and could be moved to the library). --- pkgs/stdenv/generic/default.nix | 42 +++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 246ca3696d5..1a2ca5038b2 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -111,30 +111,41 @@ let builtins.unsafeGetAttrPos "name" attrs; pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»"; - throwEvalHelp = unfreeOrBroken: whatIsWrong: - assert builtins.elem unfreeOrBroken ["Unfree" "Broken" "blacklisted"]; + throwEvalHelp = { reason, errormsg }: + # uppercase the first character of string s + let up = s: with lib; + let cs = lib.stringToCharacters s; + in concatStrings (singleton (toUpper (head cs)) ++ tail cs); + in + assert builtins.elem reason ["unfree" "broken" "blacklisted"]; - throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${whatIsWrong}, refusing to evaluate." - + (lib.strings.optionalString (unfreeOrBroken != "blacklisted") '' + throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate." + + (lib.strings.optionalString (reason != "blacklisted") '' For `nixos-rebuild` you can set - { nixpkgs.config.allow${unfreeOrBroken} = true; } + { nixpkgs.config.allow${up reason} = true; } in configuration.nix to override this. For `nix-env` you can add - { allow${unfreeOrBroken} = true; } + { allow${up reason} = true; } to ~/.nixpkgs/config.nix. '')); - licenseAllowed = attrs: + # Check if a derivation is valid, that is whether it passes checks for + # e.g brokenness or license. + # + # Return { valid: Bool } and additionally + # { reason: String; errormsg: String } if it is not valid, where + # reason is one of "unfree", "blacklisted" or "broken". + checkValidity = attrs: if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then - throwEvalHelp "Unfree" "has an unfree license (‘${showLicense attrs.meta.license}’)" + { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } else if hasBlacklistedLicense attrs then - throwEvalHelp "blacklisted" "has a blacklisted license (‘${showLicense attrs.meta.license}’)" + { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then - throwEvalHelp "Broken" "is marked as broken" + { valid = false; reason = "broken"; errormsg = "is marked as broken"; } else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then - throwEvalHelp "Broken" "is not supported on ‘${result.system}’" - else true; + { valid = false; reason = "broken"; errormsg = "is not supported on ‘${result.system}’"; } + else { valid = true; }; outputs' = outputs ++ @@ -144,7 +155,12 @@ let (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []); in - assert licenseAllowed attrs; + + # Throw an error if trying to evaluate an non-valid derivation + assert let v = checkValidity attrs; + in if !v.valid + then throwEvalHelp (removeAttrs v ["valid"]) + else true; lib.addPassthru (derivation ( (removeAttrs attrs From 8cd52ce5f7cc8b949c77dc83b68188af7095de10 Mon Sep 17 00:00:00 2001 From: Matthijs Steen Date: Fri, 27 Nov 2015 21:41:23 +0100 Subject: [PATCH 127/157] basex: 7.8.2 -> 8.3.1 --- pkgs/tools/text/xml/basex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index c67444838b2..e2b59bdb115 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-7.8.2"; + name = "basex-8.3.1"; src = fetchurl { - url = "http://files.basex.org/releases/7.8.2/BaseX782.zip"; - sha256 = "0i9h7fsvn8cy1g44f23iyqndwamvx4kvyc4y3i00j15qm6qd2kbm"; + url = "http://files.basex.org/releases/8.3.1/BaseX831.zip"; + sha256 = "08ba0qvfaa1560hy0nsiq9y6slgdj46j9rdssigf2vvkc5ngkgg0"; }; buildInputs = [ unzip jre ]; From c7f4092ed32541d4b1a700fc8d39678590ab470a Mon Sep 17 00:00:00 2001 From: Timofei Kushnir Date: Sat, 28 Nov 2015 08:55:47 +0300 Subject: [PATCH 128/157] Enable to create hybrid ISO without UEFI boot --- nixos/lib/make-iso9660-image.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index c9a37379469..31bfe23d3d4 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -119,7 +119,11 @@ $xorriso -output $out/iso/$isoName if test -n "$usbBootable"; then echo "Making image hybrid..." - isohybrid --uefi $out/iso/$isoName + if test -n "$efiBootable"; then + isohybrid --uefi $out/iso/$isoName + else + isohybrid $out/iso/$isoName + fi fi if test -n "$compressImage"; then From a3fa690fa288567662d10d664d89f0e9cd21014d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 28 Nov 2015 09:48:55 +0100 Subject: [PATCH 129/157] ocaml: add local copy of the ocamlbuild patch --- pkgs/development/compilers/ocaml/4.02.nix | 6 +-- .../compilers/ocaml/ocamlbuild.patch | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/compilers/ocaml/ocamlbuild.patch diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix index 7338f8b3674..91b543151e3 100644 --- a/pkgs/development/compilers/ocaml/4.02.nix +++ b/pkgs/development/compilers/ocaml/4.02.nix @@ -9,10 +9,6 @@ assert useX11 -> !stdenv.isArm && !stdenv.isMips; let useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; - patchOcamlBuild = fetchurl { - url = https://github.com/ocaml/ocaml/pull/117.patch; - sha256 = "0x2cdn2sgzq29qzqg5y2ial0jqy8gjg5a7jf8qqch55dc4vkyjw0"; - }; in stdenv.mkDerivation rec { @@ -28,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3"; }; - patches = [ patchOcamlBuild ]; + patches = [ ./ocamlbuild.patch ]; prefixKey = "-prefix "; configureFlags = optionals useX11 [ "-x11lib" x11lib diff --git a/pkgs/development/compilers/ocaml/ocamlbuild.patch b/pkgs/development/compilers/ocaml/ocamlbuild.patch new file mode 100644 index 00000000000..d153fb67d41 --- /dev/null +++ b/pkgs/development/compilers/ocaml/ocamlbuild.patch @@ -0,0 +1,45 @@ +Author: Vincent Laporte +Date: Sun Feb 1 11:19:50 2015 +0100 + + ocamlbuild: use ocamlfind to discover camlp4 path + + and default to `+camlp4` + +diff --git a/ocamlbuild/ocaml_specific.ml b/ocamlbuild/ocaml_specific.ml +index b902810..a73b7a5 100644 +--- a/ocamlbuild/ocaml_specific.ml ++++ b/ocamlbuild/ocaml_specific.ml +@@ -698,15 +698,25 @@ ocaml_lib ~extern:true ~tag_name:"use_toplevel" "toplevellib";; + ocaml_lib ~extern:true ~dir:"+ocamldoc" "ocamldoc";; + ocaml_lib ~extern:true ~dir:"+ocamlbuild" ~tag_name:"use_ocamlbuild" "ocamlbuildlib";; + +-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_camlp4" "camlp4lib";; +-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_old_camlp4" "camlp4";; +-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_camlp4_full" "camlp4fulllib";; ++let camlp4dir = ++ Findlib.( ++ try ++ if sys_command "sh -c 'ocamlfind list >/dev/null' 2>/dev/null" != 0 ++ then raise (Findlib_error Cannot_run_ocamlfind); ++ (query "camlp4").location ++ with Findlib_error _ -> ++ "+camlp4" ++ );; ++ ++ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_camlp4" "camlp4lib";; ++ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_old_camlp4" "camlp4";; ++ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_camlp4_full" "camlp4fulllib";; + flag ["ocaml"; "compile"; "use_camlp4_full"] +- (S[A"-I"; A"+camlp4/Camlp4Parsers"; +- A"-I"; A"+camlp4/Camlp4Printers"; +- A"-I"; A"+camlp4/Camlp4Filters"]);; +-flag ["ocaml"; "use_camlp4_bin"; "link"; "byte"] (A"+camlp4/Camlp4Bin.cmo");; +-flag ["ocaml"; "use_camlp4_bin"; "link"; "native"] (A"+camlp4/Camlp4Bin.cmx");; ++ (S[A"-I"; A(camlp4dir^"/Camlp4Parsers"); ++ A"-I"; A(camlp4dir^"/Camlp4Printers"); ++ A"-I"; A(camlp4dir^"/Camlp4Filters")]);; ++flag ["ocaml"; "use_camlp4_bin"; "link"; "byte"] (A(camlp4dir^"/Camlp4Bin.cmo"));; ++flag ["ocaml"; "use_camlp4_bin"; "link"; "native"] (A(camlp4dir^"/Camlp4Bin.cmx"));; + + flag ["ocaml"; "debug"; "compile"; "byte"] (A "-g");; + flag ["ocaml"; "debug"; "link"; "byte"; "program"] (A "-g");; From 6a622acc87fbd67890c7ff7de72b7ee33ada6606 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 28 Nov 2015 10:41:41 +0100 Subject: [PATCH 130/157] merlin: 2.3 -> 2.3.1 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 6618d079ea8..9538d8e1cc2 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; -let version = "2.3"; in +let version = "2.3.1"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz"; - sha256 = "18glpvd572ajz0d66chx2ib5miy4b29q1qhc7sxb60mlsrffr13s"; + sha256 = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; }; buildInputs = [ ocaml findlib yojson menhir ] From 920930510e7a8b626545890af5f41ac531814a57 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 28 Nov 2015 05:53:50 -0500 Subject: [PATCH 131/157] idris-wl-pprint: Use fetchFromGitHub --- pkgs/development/idris-modules/wl-pprint.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index 2bf5ef79253..66dd4cefe48 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -1,5 +1,5 @@ { build-idris-package -, fetchgit +, fetchFromGitHub , prelude , base , lib @@ -7,10 +7,11 @@ }: build-idris-package { name = "wl-pprint"; - src = fetchgit { - url = "git://github.com/shayan-najd/wl-pprint.git"; + src = fetchFromGitHub { + owner = "shayan-najd"; + repo = "wl-pprint"; rev = "120f654b0b9838b57e10b163d3562d959439fb07"; - sha256 = "b5d02a9191973dd8915279e84a9b4df430eb252f429327f45eb8a047d8bb954d"; + sha256 = "1yymdl251zla6hv9rcg06x73gbp6xb0n6f6a02bsy5fqfmrfngcl"; }; propagatedBuildInputs = [ prelude base ]; From dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 28 Nov 2015 11:25:35 +0100 Subject: [PATCH 132/157] gpsbabel: fix build for i686 --- pkgs/applications/misc/gpsbabel/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 90de624c733..172f1347f6b 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-zlib=system" ] # Floating point behavior on i686 causes test failures. Preventing # extended precision fixes this problem. - ++ stdenv.lib.optional stdenv.isi686 "CXXFLAGS=-ffloat-store"; + ++ stdenv.lib.optionals stdenv.isi686 [ + "CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store" + ]; enableParallelBuilding = true; @@ -32,7 +34,11 @@ stdenv.mkDerivation rec { patchShebangs testo substituteInPlace testo \ --replace "-x /usr/bin/hexdump" "" - ''; + '' + ( + # The raymarine and gtm tests fail on i686 despite -ffloat-store. + if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;" + else "" + ); meta = with stdenv.lib; { description = "Convert, upload and download data from GPS and Map programs"; From 3c771b0f558daca09dd753395fbac43ee843459c Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Wed, 25 Nov 2015 09:24:20 +0100 Subject: [PATCH 133/157] davmail: 4.6.1 -> 4.7.0 Upgrade message: http://sourceforge.net/p/davmail/mailman/message/34597887/ This new release contains a lot of fixes from user feedback, a new -notray command line option to force window mode and avoid tricky tray icon issues on Linux and native smartcard support on Windows. Caldav: - Caldav: Map additional priority levels - Caldav: fix missing LAST-MODIFIED in events Enhancements: - Improved tray icon with alpha blend - Fix imports - Prepare mutual SSL authentication between client and DavMail implementation - Implement -notray command line option as a workaround for broken SWT and Unity issues - Change warning messages to debug in close method - Improve client certificate dialog, build description from certificate - Exclude client certificates not issued by server provided issuers list IMAP: - IMAP: Additional translations and doc for new IMAP setting - IMAP: Merge patch by Mauro Cicognini, add a new setting to always send approximate message in RFC822.SIZE to avoid downloading full message body - IMAP: fix regression with quotes inside folder names - IMAP: handle quotes inside folder names correctly OSX: - OSX link local address on loopback interface - Exclude arguments starting with dash to avoid patch 38 regression on OSX Documentation: - Doc: Document -notray option - Switch to OpenHub instead of Ohloh EWS: - EWS: prepare distribution list implementation - Fix #254 davmail.exchange.ews.EWSException: ErrorIncorrectUpdatePropertyCount Linux: - Refresh davmail.spec, make RPM noarch - Handle missing or broken SWT library Windows: - Windows: Make MSCAPI keystore type available in Settings for Windows native smartcard support - Instantiate MSCAPI explicitly to access Windows Smartcards - Enable native Windows SmartCard access through MSCAPI (no PKCS11 config required) Carddav: - Carddav: Test case for comma in ADR field - Carddav: Do not replace comma on ADR field, see support request 255 - Caldav: Ignore missing END:VCALENDAR line on modified occurrences - CardDav: Add empty property test case --- pkgs/applications/networking/davmail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 37d4870d181..7773fcaf0c4 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.6.1"; + name = "davmail-4.7.0"; src = fetchurl { - url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.6.1-2343.tgz"; - sha256 = "15kpbrmw9pcifxj4k4m3q0azbl95kfgwvgb8bc9aj00q0yi3wgiq"; + url = "mirror://sourceforge/davmail/4.7.0/davmail-linux-x86_64-4.7.0-2408.tgz"; + sha256 = "1kasnqnvw8icm32m5vbvkpx5im1w4sifiaafb08rw4a1zn8asxv1"; }; buildInputs = [ makeWrapper ]; From 138a42dd11f520b114cbc1727b6f6f0825680b1d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 28 Nov 2015 14:22:33 +0000 Subject: [PATCH 134/157] webfs: fix mime types Unfortunately the shared_mime_info format is not compatible with webfs. Instead of pulling the whole httpd package I opted for just fetching the mime.types file from the apache httpd project. --- pkgs/servers/http/webfs/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix index b306c73f4a5..3fb3890f9c4 100644 --- a/pkgs/servers/http/webfs/default.nix +++ b/pkgs/servers/http/webfs/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchurl, openssl, shared_mime_info }: +{ stdenv, fetchurl, openssl }: +let + # Let's not pull the whole apache httpd package + mime_file = fetchurl { + url = https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types; + sha256 = "ef972fc545cbff4c0daa2b2e6b440859693b3c10435ee90f10fa6fffad800c16"; + }; +in stdenv.mkDerivation rec { name = "webfs-${version}"; version = "1.21"; @@ -13,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; makeFlags = [ - "mimefile=${shared_mime_info}/share/mime/globs" + "mimefile=${mime_file}" "prefix=$(out)" ]; From 6955e7cd09eda5276dc5c23dc817ae5a4cb4444e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 28 Nov 2015 15:49:55 +0100 Subject: [PATCH 135/157] pythonPackages.click 5.1 -> 6.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d386f9131db..36e34eb4b9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2215,11 +2215,11 @@ in modules // { }; click = buildPythonPackage rec { - name = "click-5.1"; + name = "click-6.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz"; - sha256 = "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337"; + sha256 = "09mi68vazmlqd0f94kjvqqlpjig4m5xl996zprwnghj90cn32ncw"; }; meta = { From 55ab2a1eeb5e973d5d047f575d74d9436ce9fab6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 28 Nov 2015 17:36:53 +0100 Subject: [PATCH 136/157] eclipse-plugin-testng: 6.9.8 -> 6.9.10 --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 0d0c9d14814..3f454da04af 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -335,16 +335,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.8.201510130443"; + version = "6.9.10.201511281504"; srcFeature = fetchurl { url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar"; - sha256 = "0g0dva1zpqk0rz0vgr025g2cfc47snr857fsqcrssmp9qmy8x0i0"; + sha256 = "1kjaifa1fc16yh82bzp5xa5pn3kgrpgc5jq55lyvgz29vjj6ss97"; }; srcPlugin = fetchurl { url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar"; - sha256 = "16mnvqkakixqp3bcnyx6x2iwkhnv3k4q561c97kssz98xsrr8f54"; + sha256 = "1njz4ynjwnhjjbsszfgqyjn2ixxzjv8qvnc7dqz8jldrz3jrjf07"; }; meta = with stdenv.lib; { From ef4f3e6ff4b96d52af5a5819bb0b822b1073377d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 28 Nov 2015 16:53:26 +0000 Subject: [PATCH 137/157] php56: 5.6.15 -> 5.6.16 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 565a9a73a2f..c2427d5c621 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -295,8 +295,8 @@ in { }; php56 = generic { - version = "5.6.15"; - sha256 = "0f0wplfnclr6ji6r2g5q0rdnp26xi7gxdq51dljrwx2b9mf6980i"; + version = "5.6.16"; + sha256 = "1bnjpj5vjj2sx80z3x452vhk7bfdl8hbli61byhapgy1ch4z9rjg"; }; php70 = lib.lowPrio (generic { From f6627a94024ad4ca6e52bc6d2cfbe5d2ad72b425 Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Sat, 28 Nov 2015 20:17:49 +0100 Subject: [PATCH 138/157] syncthing: 0.11 -> 0.12 Also, keep 0.11 around (in an updated version) and make the pkg an option to the service module. --- .../modules/services/networking/syncthing.nix | 15 +++- pkgs/top-level/all-packages.nix | 6 +- pkgs/top-level/go-packages.nix | 82 +++++++++++++------ 3 files changed, 71 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 4eb32b1cf30..56c384731c6 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -21,7 +21,7 @@ in description = '' Whether to enable the Syncthing, self-hosted open-source alternative to Dropbox and BittorrentSync. Initial interface will be - available on http://127.0.0.1:8080/. + available on http://127.0.0.1:8384/. ''; }; @@ -40,6 +40,17 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.syncthing; + example = literalExample "pkgs.syncthing"; + description = '' + Syncthing package to use. + ''; + }; + + + }; }; @@ -66,7 +77,7 @@ in }; }; - environment.systemPackages = [ pkgs.syncthing ]; + environment.systemPackages = [ cfg.package ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6802fa64da..c74d8f535f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4864,7 +4864,7 @@ let tinycc = callPackage ../development/compilers/tinycc { }; trv = callPackage ../development/tools/misc/trv { - inherit (ocamlPackages_4_02) findlib camlp4 core async async_unix + inherit (ocamlPackages_4_02) findlib camlp4 core async async_unix async_extra sexplib async_shell core_extended async_find cohttp uri; ocaml = ocaml_4_02; }; @@ -13102,8 +13102,8 @@ let symlinks = callPackage ../tools/system/symlinks { }; - # syncthing is pinned to go1.4 until https://github.com/golang/go/issues/12301 is resolved - syncthing = go14Packages.syncthing.bin // { outputs = [ "bin" ]; }; + syncthing = go15Packages.syncthing.bin // { outputs = [ "bin" ]; }; + syncthing011 = go15Packages.syncthing011.bin // { outputs = [ "bin" ]; }; # linux only by now synergy = callPackage ../applications/misc/synergy { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 1da66c4de11..ee40120e8bd 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -19,11 +19,11 @@ let ## OFFICIAL GO PACKAGES crypto = buildFromGitHub { - rev = "d5c5f1769f2fcd2377be6f29863081f59a4fc80f"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; date = "2015-08-29"; owner = "golang"; repo = "crypto"; - sha256 = "0rkcvl3q8akkar4rmj052z23y61hbav9514ky6grb4gvxfx4ydbn"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; goPackagePath = "golang.org/x/crypto"; goPackageAliases = [ "code.google.com/p/go.crypto" @@ -58,18 +58,18 @@ let }; net = buildFromGitHub { - rev = "ea47fc708ee3e20177f3ca3716217c4ab75942cb"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; date = "2015-08-29"; owner = "golang"; repo = "net"; - sha256 = "0x1pmg97n7l62vak9qnjdjrrfl98jydhv6j0w3jkk4dycdlzn30d"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; goPackagePath = "golang.org/x/net"; goPackageAliases = [ "code.google.com/p/go.net" "github.com/hashicorp/go.net" "github.com/golang/net" ]; - propagatedBuildInputs = [ text ]; + propagatedBuildInputs = [ text crypto ]; }; oauth2 = buildFromGitHub { @@ -95,11 +95,11 @@ let }; snappy = buildFromGitHub { - rev = "0c7f8a7704bfec561913f4df52c832f094ef56f0"; + rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; date = "2015-07-21"; owner = "golang"; repo = "snappy"; - sha256 = "17j421ra8jm2da8gc0sk71g3n1nizqsfx1mapn255nvs887lqm0y"; + sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; goPackageAliases = [ "code.google.com/p/snappy-go/snappy" ]; }; @@ -116,11 +116,11 @@ let }; text = buildFromGitHub { - rev = "505f8b49cc14d790314b7535959a10b87b9161c7"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; date = "2015-08-27"; owner = "golang"; repo = "text"; - sha256 = "0h31hyb1ijs7zcsmpwa713x41k1wkh0igv7i4chwvwyjyl7zligy"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; goPackagePath = "golang.org/x/text"; goPackageAliases = [ "github.com/golang/text" ]; }; @@ -963,11 +963,11 @@ let }; goleveldb = buildFromGitHub { - rev = "183614d6b32571e867df4cf086f5480ceefbdfac"; - date = "2015-06-17"; + rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; + date = "2015-08-19"; owner = "syndtr"; repo = "goleveldb"; - sha256 = "0crslwglkh8b3204l4zvav712a7yd2ykjnbrnny6yrq94mlvba8r"; + sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; propagatedBuildInputs = [ ginkgo gomega snappy ]; }; @@ -2136,10 +2136,10 @@ let }; osext = buildFromGitHub { - rev = "6e7f843663477789fac7c02def0d0909e969b4e5"; + rev = "10da29423eb9a6269092eebdc2be32209612d9d2"; owner = "kardianos"; repo = "osext"; - sha256 = "1sn1kk60azqbll687fndiskkfvp0ppca8rmakv8wgsn7a64sm39f"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; goPackageAliases = [ "github.com/bugsnag/osext" "bitbucket.org/kardianos/osext" @@ -2710,12 +2710,12 @@ let sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; }; - relaysrv = buildFromGitHub { + relaysrv = buildFromGitHub rec { rev = "7fe1fdd8c751df165ea825bc8d3e895f118bb236"; owner = "syncthing"; repo = "relaysrv"; sha256 = "0qy14pa0z2dq5mix5ylv2raabwxqwj31g5kkz905wzki6d4j5lnp"; - buildInputs = [ xdr syncthing-protocol ratelimit syncthing-lib ]; + buildInputs = [ xdr syncthing-protocol011 ratelimit syncthing-lib ]; }; reflectwalk = buildFromGitHub { @@ -2903,26 +2903,43 @@ let sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50"; }; - suture = buildFromGitHub { - rev = "fc7aaeabdc43fe41c5328efa1479ffea0b820978"; + suture = buildFromGitHub rec { + version = "1.0.1"; + rev = "v${version}"; owner = "thejerf"; repo = "suture"; - sha256 = "1l7nw00pazp317n5nprrxwhcq56kdblc774lsznxmbb30xcp8nmf"; + sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; }; syncthing = buildFromGitHub rec { - version = "0.11.25"; + version = "0.12.4"; rev = "v${version}"; owner = "syncthing"; repo = "syncthing"; - sha256 = "17phkj0dxzc1j755ddpf15rq34yp52pw2lx9kpg7gyc9qp0pzacl"; - doCheck = false; # Tests are currently broken for 32-bit but they are benign + sha256 = "0sri86hsjpf4xlhi45zkafi1jncamzplxnvriza0xsah1bc31g65"; + # buildFlags = [ "-tags noupgrade,release" ]; buildInputs = [ - go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol relaysrv + go-lz4 du luhn xdr snappy ratelimit osext + goleveldb suture qart crypto net text rcrowley.go-metrics + ]; + postPatch = '' + # Mostly a cosmetic change + sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go + ''; + }; + + syncthing011 = buildFromGitHub rec { + version = "0.11.26"; + rev = "v${version}"; + owner = "syncthing"; + repo = "syncthing"; + sha256 = "0c0dcvxrvjc84dvrsv90790aawkmavsj9bwp8c6cd6wrwj3cp9lq"; + buildInputs = [ + go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol011 goleveldb suture qart crypto net text ]; postPatch = '' - # Mostly a costmetic change + # Mostly a cosmetic change sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go ''; }; @@ -2930,10 +2947,21 @@ let syncthing-lib = buildFromGitHub { inherit (syncthing) rev owner repo sha256; subPackages = [ "lib/sync" ]; - buildInputs = [ logger ]; + propagatedBuildInputs = syncthing.buildInputs; }; syncthing-protocol = buildFromGitHub { + inherit (syncthing) rev owner repo sha256; + subPackages = [ "lib/protocol" ]; + propagatedBuildInputs = [ + go-lz4 + logger + luhn + xdr + text ]; + }; + + syncthing-protocol011 = buildFromGitHub { rev = "84365882de255d2204d0eeda8dee288082a27f98"; date = "2015-08-28"; owner = "syncthing"; @@ -3116,11 +3144,11 @@ let }; xdr = buildFromGitHub { - rev = "5f7208e86762911861c94f1849eddbfc0a60cbf0"; + rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; date = "2015-04-08"; owner = "calmh"; repo = "xdr"; - sha256 = "18m8ms2kg4apj5772r317i3axklgci8x1pq3pgicsv3acmpclh47"; + sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; }; xon = buildFromGitHub { From cb58cf57d6173da57df9ccd87b09180512889cf1 Mon Sep 17 00:00:00 2001 From: Markus Wotringer Date: Sat, 28 Nov 2015 23:51:17 +0100 Subject: [PATCH 139/157] radamsa: init at 0.4 --- lib/maintainers.nix | 1 + pkgs/tools/security/radamsa/default.nix | 27 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/tools/security/radamsa/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e7931b928b3..05d51784782 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -182,6 +182,7 @@ malyn = "Michael Alyn Miller "; manveru = "Michael Fellinger "; marcweber = "Marc Weber "; + markWot = "Markus Wotringer Date: Sat, 28 Nov 2015 21:28:27 +0100 Subject: [PATCH 140/157] ispc: init at Intel SPMD Program Compiler An open-source compiler for high-performance SIMD programming on the CPU https://ispc.github.io/ --- pkgs/development/compilers/ispc/default.nix | 55 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/compilers/ispc/default.nix diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix new file mode 100644 index 00000000000..1995923842f --- /dev/null +++ b/pkgs/development/compilers/ispc/default.nix @@ -0,0 +1,55 @@ +{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages}: + +# TODO: patch LLVM so Knights Landing works better (patch included in ispc github) + +stdenv.mkDerivation rec { + version = "20151128"; + rev = "d3020580ff18836de2d4cae18901980b551d9d01"; + + name = "ispc-${version}"; + + src = fetchFromGitHub { + owner = "ispc"; + repo = "ispc"; + inherit rev; + sha256 = "15qi22qvmlx3jrhrf3rwl0y77v66prpan6qb66a55dw3pw2d4jvn"; + }; + + enableParallelBuilding = true; + + doCheck = true; + + buildInputs = with llvmPackages; [ + which + m4 + python + bison + flex + llvm + clang + ]; + + patchPhase = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; + + installPhase = '' + mkdir -p $out/bin + cp ispc $out/bin + ''; + + checkPhase = '' + export ISPC_HOME=$PWD + python run_tests.py + ''; + + makeFlags = [ + "CLANG_INCLUDE=${llvmPackages.clang-unwrapped}/include" + ]; + + meta = with stdenv.lib; { + homepage = https://ispc.github.io/ ; + description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.aristid ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7337e8a271..2fe82edfdd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6750,6 +6750,10 @@ let isocodes = callPackage ../development/libraries/iso-codes { }; + ispc = callPackage ../development/compilers/ispc { + llvmPackages = llvmPackages_37; + }; + itk = callPackage ../development/libraries/itk { }; jasper = callPackage ../development/libraries/jasper { }; From a936b602b58bffc2e0a903085fcbbb5df88850ea Mon Sep 17 00:00:00 2001 From: Fabian Schmitthenner Date: Fri, 27 Nov 2015 23:58:49 +0000 Subject: [PATCH 141/157] smartmontools: 6.3 -> 6.4, update driverdb to r4179 --- pkgs/tools/system/smartmontools/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 72c8f8d028e..157b980be8c 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,23 +1,25 @@ { stdenv, fetchurl }: let - dbrev = "3849"; + version = "6.4"; + drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; + dbrev = "4167"; driverdb = fetchurl { - url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/trunk/smartmontools/drivedb.h?format=raw"; - sha256 = "06c1cl0x4sq64l3rmd5rk8wsbggjixphpgj0kf4awqhjgsi102xz"; + url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; + sha256 = "14rv1cxbpmnq12hjwr3icjiahx5i0ak7j69310c09rah0241l5j1"; name = "smartmontools-drivedb.h"; }; in stdenv.mkDerivation rec { - name = "smartmontools-6.3"; + name = "smartmontools-${version}"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "06gy71jh2d3gcfmlbbrsqw7215knkfq59q3j6qdxfrar39fhcxx7"; + sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza"; }; patchPhase = '' - : cp ${driverdb} drivedb.h + cp ${driverdb} drivedb.h sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in ''; From f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 29 Nov 2015 08:56:40 +0100 Subject: [PATCH 142/157] cmake: remove conditional patch that no longer applies Close #11290. The patch will no longer apply on *any* platform. --- pkgs/development/tools/build-managers/cmake/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 59bcfe45ea2..09e54d3dfa6 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -30,13 +30,8 @@ stdenv.mkDerivation rec { patches = # Don't search in non-Nix locations such as /usr, but do search in # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path-3.2.patch ++ - optional (stdenv ? cross) (fetchurl { - name = "fix-darwin-cross-compile.patch"; - url = "http://public.kitware.com/Bug/file_download.php?" - + "file_id=4981&type=bug"; - sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }) ++ stdenv.lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; + optional (stdenv ? glibc) ./search-path-3.2.patch + ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; buildInputs = [ bzip2 curl expat libarchive xz zlib ] From 81b9cc6f54bd05299d5c4b487a8c35d73b8183f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 29 Nov 2015 09:33:50 +0100 Subject: [PATCH 143/157] html-tidy: unify with its drop-in replacement tidy-html5 - the original project has been unmaintained for years - some dependants needed to be patched due to renamed headers https://github.com/htacg/tidy-html5/issues/326#issuecomment-160329114 - separate tidy-html5 package was removed, as since the 5.0.0 version it's meant as a successor to both, and library name got back from libtidy5.so to libtidy.so https://github.com/htacg/tidy-html5/issues/326#issuecomment-160314666 /cc committers to tidy-html5: @edwjto and @zimbatm. --- .../kde-4.14/kde-baseapps/kde-baseapps.nix | 5 ++ .../kde-4.14/kdewebdev/klinkstatus.nix | 5 ++ .../libraries/mailcore2/default.nix | 4 +- pkgs/servers/prayer/default.nix | 15 +++-- pkgs/tools/text/html-tidy/default.nix | 58 ++++++++----------- pkgs/tools/text/tidy-html5/default.nix | 25 -------- pkgs/top-level/all-packages.nix | 2 - 7 files changed, 46 insertions(+), 68 deletions(-) delete mode 100644 pkgs/tools/text/tidy-html5/default.nix diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix index 31245413f15..98fab7d2559 100644 --- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix @@ -2,6 +2,11 @@ , nepomuk_core, nepomuk_widgets, libXt }: kde { + postPatch = '' + substituteInPlace konq-plugins/validators/tidy_validator.cpp \ + --replace buffio.h tidybuffio.h + ''; + buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ]; meta = { diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix index b0138ecb48b..b593c952219 100644 --- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix @@ -4,6 +4,11 @@ kde { # todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old + postPatch = '' + substituteInPlace klinkstatus/src/tidy/tidyx.h \ + --replace buffio.h tidybuffio.h + ''; + buildInputs = [ kdelibs kdepimlibs html-tidy boost ]; meta = { diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 8cf0744a0d1..de82bd0243e 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace "tidy/tidy.h" "tidy.h" \ --replace "/usr/include/tidy" "${libtidy}/include" \ - --replace "/usr/include/libxml2" "${libxml2}/include/libxml2" \ + --replace "/usr/include/libxml2" "${libxml2}/include/libxml2" + substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ + --replace buffio.h tidybuffio.h ''; cmakeFlags = [ diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 1e476cb2301..447d63c731d 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -6,17 +6,12 @@ let in stdenv.mkDerivation rec { name = "prayer-1.3.5"; - + src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${name}.tar.gz"; sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; }; - buildInputs = [ openssl db zlib uwimap html-tidy pam ]; - nativeBuildInputs = [ perl ]; - - NIX_LDFLAGS = "-lpam"; - patches = [ ./install.patch ]; postPatch = '' sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \ @@ -26,8 +21,16 @@ stdenv.mkDerivation rec { Config sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \ templates/src/*.pl + '' + /* html-tidy updates */ '' + substituteInPlace ./session/html_secure_tidy.c \ + --replace buffio.h tidybuffio.h ''; + buildInputs = [ openssl db zlib uwimap html-tidy pam ]; + nativeBuildInputs = [ perl ]; + + NIX_LDFLAGS = "-lpam"; + meta = { homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 247cb67da56..062715b8302 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,41 +1,31 @@ -{ fetchcvs, stdenv, autoconf, automake, libtool }: +{ stdenv, fetchurl, cmake, libxslt }: -let date = "2009-07-04"; in - stdenv.mkDerivation rec { - name = "html-tidy-20090704"; +let + version = "5.0.0"; +in +stdenv.mkDerivation rec { + name = "html-tidy-${version}"; - # According to http://tidy.sourceforge.net/, there are no new - # release tarballs, so one has to either get the code from CVS or - # use a decade-old tarball. + src = fetchurl { + url = "https://github.com/htacg/tidy-html5/archive/${version}.tar.gz"; + sha256 = "1qz7hgk482496agngp9grz4jqkyxrp29r2ywbccc9i5198yspca4"; + }; - src = fetchcvs { - inherit date; - cvsRoot = ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy"; - module = "tidy"; - sha256 = "d2e68b4335ebfde65ef66d5684f7693675c98bdd50b7a63c0b04f61db673aa6d"; - }; + nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; - buildInputs = [ autoconf automake libtool ]; + # ATM bin/tidy is statically linked, as upstream provides no other option yet. + # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 - preConfigure = '' - cp -rv build/gnuauto/* . - AUTOMAKE="automake --foreign" autoreconf -vfi + meta = with stdenv.lib; { + description = "A HTML validator and `tidier'"; + longDescription = '' + HTML Tidy is a command-line tool and C library that can be + used to validate and fix HTML data. ''; + license = licenses.libpng; # very close to it - the 3 clauses are identical + homepage = http://html-tidy.org; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; +} - doCheck = true; - - meta = { - description = "HTML Tidy, an HTML validator and `tidier'"; - - longDescription = '' - HTML Tidy is a command-line tool and C library that can be - used to validate and fix HTML data. - ''; - - license = stdenv.lib.licenses.mit; - - homepage = http://tidy.sourceforge.net/; - - maintainers = [ ]; - }; - } diff --git a/pkgs/tools/text/tidy-html5/default.nix b/pkgs/tools/text/tidy-html5/default.nix deleted file mode 100644 index ef3bcc46ba7..00000000000 --- a/pkgs/tools/text/tidy-html5/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, cmake, fetchFromGitHub, libxslt, ... }: - -stdenv.mkDerivation rec { - - name = "tidy-html5"; - version = "4.9.30"; - - src = fetchFromGitHub { - owner = "htacg"; - repo = "tidy-html5"; - rev = version; - sha256 = "0hd4c23352r5lnh23mx137wb4mkxcjdrl1dy8kgghszik5fprs3s"; - }; - - buildInputs = [ cmake libxslt ]; - - meta = with stdenv.lib; { - description = "The granddaddy of HTML tools, with support for modern standards"; - homepage = "http://www.html-tidy.org/"; - license = licenses.w3c; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 034fcc8d0df..61ee39b4763 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3397,8 +3397,6 @@ let tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; - tidy-html5 = callPackage ../tools/text/tidy-html5 { }; - tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; From 10135e6f411b143dff4cf605ef382a6308a33675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 29 Nov 2015 12:00:22 +0100 Subject: [PATCH 144/157] fish: use absolute path to clear when pressing ^L It was unable to find `clear` for me. /cc maintainer @ocharles. --- pkgs/shells/fish/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 7ee4bd8707d..c4386b1a9fb 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { sed -e "s|gettext |${gettext}/bin/gettext |" \ -e "s|which |${which}/bin/which |" \ -i "$out/share/fish/functions/_.fish" + substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \ + --replace "clear;" "${ncurses}/bin/clear;" '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py" '' + '' From 8d62b2b8fa9a2b4171ad3bab1f665cf1917cd1d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 29 Nov 2015 13:50:55 +0100 Subject: [PATCH 145/157] nixos/release notes: explain removal of tidy-html5 This belongs to 81b9cc6f54. --- nixos/doc/manual/release-notes/rl-unstable.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index bed47a63a95..c9b31afdfcf 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -96,6 +96,14 @@ nginx.override { + + tidy-html5 package is removed. + Upstream only provided (lib)tidy5 during development, + and now they went back to (lib)tidy to work as a drop-in + replacement of the original package that has been unmaintained for years. + You can (still) use the html-tidy package, which got updated + to a stable release from this new upstream. + From 3ac171cefbd5c2616fc1aac030fb59439127d793 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 28 Nov 2015 12:18:33 +0100 Subject: [PATCH 146/157] graphite service: store PID files under /run and configure systemd to use them The advantage of putting the PID file under the ephemeral /run is that when the machine crashes /run gets cleared allowing graphite to start once the machine is rebooted. We also set the PIDFile systemd option so that systemd knows the correct PID and enables systemd to remove the file after service shut down. --- .../modules/services/monitoring/graphite.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index ac0fba597a0..57abb959fdb 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -41,8 +41,15 @@ let }; carbonOpts = name: with config.ids; '' - --nodaemon --syslog --prefix=${name} --pidfile ${dataDir}/${name}.pid ${name} + --nodaemon --syslog --prefix=${name} --pidfile /run/${name}/${name}.pid ${name} ''; + + mkPidFileDir = name: '' + mkdir -p /run/${name} + chmod 0700 /run/${name} + chown -R graphite:graphite /run/${name} + ''; + carbonEnv = { PYTHONPATH = "${pkgs.python27Packages.carbon}/lib/python2.7/site-packages"; GRAPHITE_ROOT = dataDir; @@ -370,18 +377,20 @@ in { config = mkMerge [ (mkIf cfg.carbon.enableCache { - systemd.services.carbonCache = { + systemd.services.carbonCache = let name = "carbon-cache"; in { description = "Graphite Data Storage Backend"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}"; + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; + PIDFile="/run/${name}/${name}.pid"; }; - preStart = '' + preStart = mkPidFileDir name + '' + mkdir -p ${cfg.dataDir}/whisper chmod 0700 ${cfg.dataDir}/whisper chown -R graphite:graphite ${cfg.dataDir} @@ -390,31 +399,35 @@ in { }) (mkIf cfg.carbon.enableAggregator { - systemd.services.carbonAggregator = { + systemd.services.carbonAggregator = let name = "carbon-aggregator"; in { enable = cfg.carbon.enableAggregator; description = "Carbon Data Aggregator"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}"; + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; + PIDFile="/run/${name}/${name}.pid"; }; + preStart = mkPidFileDir name; }; }) (mkIf cfg.carbon.enableRelay { - systemd.services.carbonRelay = { + systemd.services.carbonRelay = let name = "carbon-relay"; in { description = "Carbon Data Relay"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}"; + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; + PIDFile="/run/${name}/${name}.pid"; }; + preStart = mkPidFileDir name; }; }) From 862a2615e78d4e3710e310e8508f63e87db321aa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 17 Nov 2015 21:30:09 +0100 Subject: [PATCH 147/157] opensmtpd: 5.7.1p1 -> 5.7.3p1 --- pkgs/servers/mail/opensmtpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 2fd3f0421b9..cb098a84a94 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.7.1p1"; + version = "5.7.3p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "67e9dd9682ca8c181e84e66c76245a4a8f6205834f915a2c021cdfeb22049e3a"; + sha256 = "848a3c72dd22b216bb924b69dc356fc297e8b3671ec30856978950208cba74dd"; }; patches = [ ./proc_path.diff ]; From b4cd7cf88221bfb7190f32266a7266ad5230013f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Nov 2015 15:28:34 +0100 Subject: [PATCH 148/157] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/7b12664abe66756cfe3a8e8bc4ee876c56788598 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/624aeb0d41732d3b69dd8aa4b98e271fe2d67230 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/57dab1c9974199e11130c3da70ffa31480a9ca37 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/dc4725639cbc6e242e2a931eda69293005bdc464 --- .../haskell-modules/configuration-lts-0.0.nix | 13 + .../haskell-modules/configuration-lts-0.1.nix | 13 + .../haskell-modules/configuration-lts-0.2.nix | 13 + .../haskell-modules/configuration-lts-0.3.nix | 13 + .../haskell-modules/configuration-lts-0.4.nix | 13 + .../haskell-modules/configuration-lts-0.5.nix | 13 + .../haskell-modules/configuration-lts-0.6.nix | 13 + .../haskell-modules/configuration-lts-0.7.nix | 13 + .../haskell-modules/configuration-lts-1.0.nix | 13 + .../haskell-modules/configuration-lts-1.1.nix | 15 + .../configuration-lts-1.10.nix | 15 + .../configuration-lts-1.11.nix | 15 + .../configuration-lts-1.12.nix | 15 + .../configuration-lts-1.13.nix | 15 + .../configuration-lts-1.14.nix | 15 + .../configuration-lts-1.15.nix | 15 + .../haskell-modules/configuration-lts-1.2.nix | 15 + .../haskell-modules/configuration-lts-1.4.nix | 15 + .../haskell-modules/configuration-lts-1.5.nix | 15 + .../haskell-modules/configuration-lts-1.7.nix | 15 + .../haskell-modules/configuration-lts-1.8.nix | 15 + .../haskell-modules/configuration-lts-1.9.nix | 15 + .../haskell-modules/configuration-lts-2.0.nix | 15 + .../haskell-modules/configuration-lts-2.1.nix | 15 + .../configuration-lts-2.10.nix | 17 + .../configuration-lts-2.11.nix | 17 + .../configuration-lts-2.12.nix | 17 + .../configuration-lts-2.13.nix | 17 + .../configuration-lts-2.14.nix | 17 + .../configuration-lts-2.15.nix | 17 + .../configuration-lts-2.16.nix | 18 + .../configuration-lts-2.17.nix | 18 + .../configuration-lts-2.18.nix | 18 + .../configuration-lts-2.19.nix | 18 + .../haskell-modules/configuration-lts-2.2.nix | 15 + .../configuration-lts-2.20.nix | 18 + .../configuration-lts-2.21.nix | 18 + .../configuration-lts-2.22.nix | 18 + .../haskell-modules/configuration-lts-2.3.nix | 15 + .../haskell-modules/configuration-lts-2.4.nix | 15 + .../haskell-modules/configuration-lts-2.5.nix | 15 + .../haskell-modules/configuration-lts-2.6.nix | 15 + .../haskell-modules/configuration-lts-2.7.nix | 15 + .../haskell-modules/configuration-lts-2.8.nix | 15 + .../haskell-modules/configuration-lts-2.9.nix | 15 + .../haskell-modules/configuration-lts-3.0.nix | 20 + .../haskell-modules/configuration-lts-3.1.nix | 20 + .../configuration-lts-3.10.nix | 22 + .../configuration-lts-3.11.nix | 22 + .../configuration-lts-3.12.nix | 23 + .../configuration-lts-3.13.nix | 23 + .../configuration-lts-3.14.nix | 23 + .../configuration-lts-3.15.nix | 23 + .../configuration-lts-3.16.nix | 7941 +++++++++++++++++ .../haskell-modules/configuration-lts-3.2.nix | 20 + .../haskell-modules/configuration-lts-3.3.nix | 20 + .../haskell-modules/configuration-lts-3.4.nix | 20 + .../haskell-modules/configuration-lts-3.5.nix | 20 + .../haskell-modules/configuration-lts-3.6.nix | 20 + .../haskell-modules/configuration-lts-3.7.nix | 21 + .../haskell-modules/configuration-lts-3.8.nix | 22 + .../haskell-modules/configuration-lts-3.9.nix | 22 + .../haskell-modules/hackage-packages.nix | 977 +- 63 files changed, 9728 insertions(+), 221 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-lts-3.16.nix diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index a9131c99e0d..247cf8c8470 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -1599,6 +1599,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2559,6 +2560,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2995,6 +2997,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3077,6 +3080,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4779,6 +4783,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5107,6 +5112,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5496,6 +5502,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5571,6 +5578,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6094,6 +6102,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6138,6 +6147,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6916,6 +6926,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7477,6 +7488,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = dontDistribute super."stackage"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7749,6 +7761,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index e9ab38aafbb..d7817d30849 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -1599,6 +1599,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2558,6 +2559,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2994,6 +2996,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3076,6 +3079,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4778,6 +4782,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5106,6 +5111,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5495,6 +5501,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5570,6 +5577,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6093,6 +6101,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6137,6 +6146,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6915,6 +6925,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7476,6 +7487,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = dontDistribute super."stackage"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7748,6 +7760,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index f9efc66aa10..c785b995285 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -1599,6 +1599,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2558,6 +2559,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2994,6 +2996,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3076,6 +3079,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4778,6 +4782,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5106,6 +5111,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5495,6 +5501,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5570,6 +5577,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6093,6 +6101,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6137,6 +6146,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6915,6 +6925,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7476,6 +7487,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = dontDistribute super."stackage"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7748,6 +7760,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 3951d81583a..4b9fb2540f1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -1599,6 +1599,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2558,6 +2559,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2994,6 +2996,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3076,6 +3079,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4778,6 +4782,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5106,6 +5111,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5495,6 +5501,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5570,6 +5577,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6093,6 +6101,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6137,6 +6146,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6915,6 +6925,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7476,6 +7487,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = dontDistribute super."stackage"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7748,6 +7760,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index dca9ada4cc6..b62bc0dd632 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -1599,6 +1599,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2557,6 +2558,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2993,6 +2995,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3075,6 +3078,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4775,6 +4779,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5103,6 +5108,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5492,6 +5498,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5567,6 +5574,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6090,6 +6098,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6134,6 +6143,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6911,6 +6921,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7472,6 +7483,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = dontDistribute super."stackage"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7743,6 +7755,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index dada4951b8e..74ba1e18c51 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -1599,6 +1599,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2557,6 +2558,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2993,6 +2995,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3075,6 +3078,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4775,6 +4779,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5103,6 +5108,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5492,6 +5498,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5567,6 +5574,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6090,6 +6098,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6134,6 +6143,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6911,6 +6921,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7472,6 +7483,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = dontDistribute super."stackage"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7743,6 +7755,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index a2ec91c250b..35938f9e12d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -1596,6 +1596,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2554,6 +2555,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2990,6 +2992,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3072,6 +3075,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4771,6 +4775,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5099,6 +5104,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5488,6 +5494,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5563,6 +5570,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6085,6 +6093,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6129,6 +6138,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6905,6 +6915,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7466,6 +7477,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = dontDistribute super."stackage"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7737,6 +7749,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 37379029886..294f0f93042 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -1596,6 +1596,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2554,6 +2555,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2990,6 +2992,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3072,6 +3075,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4771,6 +4775,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5099,6 +5104,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5488,6 +5494,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5563,6 +5570,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6085,6 +6093,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6129,6 +6138,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6905,6 +6915,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7466,6 +7477,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = dontDistribute super."stackage"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7737,6 +7749,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 3e0631c4f90..53e1b874332 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -1591,6 +1591,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2545,6 +2546,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2980,6 +2982,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3062,6 +3065,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4759,6 +4763,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5087,6 +5092,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5476,6 +5482,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5551,6 +5558,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6073,6 +6081,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6116,6 +6125,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_7"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6890,6 +6900,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7450,6 +7461,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7721,6 +7733,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index fc09f65da53..a52ab9a62d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -1190,6 +1190,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1590,6 +1591,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2205,6 +2207,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2540,6 +2543,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2974,6 +2978,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3056,6 +3061,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4749,6 +4755,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5077,6 +5084,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5466,6 +5474,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5540,6 +5549,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6062,6 +6072,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6105,6 +6116,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6879,6 +6891,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7438,6 +7451,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7708,6 +7722,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index cf7ff690b7e..538cc1cf028 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2200,6 +2202,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2534,6 +2537,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2968,6 +2972,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3048,6 +3053,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_1"; "file-location" = doDistribute super."file-location_0_4_6"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4728,6 +4734,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5055,6 +5062,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5443,6 +5451,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5517,6 +5526,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6035,6 +6045,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6078,6 +6089,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6849,6 +6861,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7406,6 +7419,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7674,6 +7688,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 153d11d5b52..cbcb1ea8217 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2200,6 +2202,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2534,6 +2537,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2968,6 +2972,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3048,6 +3053,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_6"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4726,6 +4732,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5052,6 +5059,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5439,6 +5447,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5513,6 +5522,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6031,6 +6041,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6074,6 +6085,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6845,6 +6857,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7402,6 +7415,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7670,6 +7684,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 853819d2e78..7e6c0fb7b37 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2200,6 +2202,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2534,6 +2537,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2968,6 +2972,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3048,6 +3053,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_6"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4725,6 +4731,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5051,6 +5058,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5438,6 +5446,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5512,6 +5521,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6030,6 +6040,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6073,6 +6084,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6844,6 +6856,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7400,6 +7413,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7668,6 +7682,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 195eab76b66..b485c404024 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2200,6 +2202,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2534,6 +2537,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2967,6 +2971,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3047,6 +3052,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_6"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4723,6 +4729,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5049,6 +5056,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5436,6 +5444,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5510,6 +5519,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6028,6 +6038,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6071,6 +6082,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6842,6 +6854,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7398,6 +7411,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7665,6 +7679,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 193f71f12cc..947913cb534 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -1188,6 +1188,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1587,6 +1588,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2198,6 +2200,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2531,6 +2534,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2964,6 +2968,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3044,6 +3049,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_6"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4719,6 +4725,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5044,6 +5051,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5431,6 +5439,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5504,6 +5513,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6021,6 +6031,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6064,6 +6075,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6834,6 +6846,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7390,6 +7403,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7657,6 +7671,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 7132c5d79eb..f6e16481c04 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -1187,6 +1187,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1586,6 +1587,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2195,6 +2197,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2527,6 +2530,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2959,6 +2963,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3039,6 +3044,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_6"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4714,6 +4720,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5039,6 +5046,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5426,6 +5434,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5499,6 +5508,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6014,6 +6024,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6057,6 +6068,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6825,6 +6837,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7381,6 +7394,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7646,6 +7660,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 35b6a37b3f7..2ef6e45d736 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -1190,6 +1190,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1590,6 +1591,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2204,6 +2206,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2538,6 +2541,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2972,6 +2976,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3054,6 +3059,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4746,6 +4752,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5074,6 +5081,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5463,6 +5471,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5537,6 +5546,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6058,6 +6068,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6101,6 +6112,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6874,6 +6886,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7432,6 +7445,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7702,6 +7716,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 4b9332ad1d0..513e4d036ff 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2203,6 +2205,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2537,6 +2540,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2971,6 +2975,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3053,6 +3058,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7_1"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4743,6 +4749,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5071,6 +5078,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13"; "language-kort" = dontDistribute super."language-kort"; @@ -5460,6 +5468,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5534,6 +5543,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6054,6 +6064,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6097,6 +6108,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6869,6 +6881,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7427,6 +7440,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7696,6 +7710,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 378bcae137f..4d92f5a9da1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2202,6 +2204,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2536,6 +2539,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2970,6 +2974,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3052,6 +3057,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_7_1"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4741,6 +4747,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5069,6 +5076,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5458,6 +5466,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5532,6 +5541,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6052,6 +6062,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6095,6 +6106,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6867,6 +6879,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7425,6 +7438,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7694,6 +7708,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 86e5f2797ad..167bacddc4f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2202,6 +2204,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2536,6 +2539,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2970,6 +2974,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3052,6 +3057,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8"; "file-location" = doDistribute super."file-location_0_4_5_3"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4736,6 +4742,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5063,6 +5070,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5452,6 +5460,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5526,6 +5535,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6046,6 +6056,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6089,6 +6100,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6861,6 +6873,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7419,6 +7432,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7688,6 +7702,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 0791d9f9bee..370b302a5b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2202,6 +2204,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2536,6 +2539,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2970,6 +2974,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3050,6 +3055,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8"; "file-location" = doDistribute super."file-location_0_4_6"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4732,6 +4738,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5059,6 +5066,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5447,6 +5455,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5521,6 +5530,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6041,6 +6051,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6084,6 +6095,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6856,6 +6868,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7414,6 +7427,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7683,6 +7697,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 5778d6c05e8..9374eab101f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -1189,6 +1189,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1589,6 +1590,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_0_1_0"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2202,6 +2204,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = dontDistribute super."consul-haskell"; @@ -2536,6 +2539,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2970,6 +2974,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_0_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3050,6 +3055,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8"; "file-location" = doDistribute super."file-location_0_4_6"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4730,6 +4736,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -5057,6 +5064,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5445,6 +5453,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5519,6 +5528,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -6038,6 +6048,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -6081,6 +6092,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec" = doDistribute super."parsec_3_1_8"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; @@ -6853,6 +6865,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7411,6 +7424,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_3_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7680,6 +7694,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index c77c46ae8ee..a8232eb6b61 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -1178,6 +1178,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1574,6 +1575,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_1_0_2"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2179,6 +2181,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2508,6 +2511,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2938,6 +2942,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3019,6 +3024,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4676,6 +4682,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4996,6 +5003,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5378,6 +5386,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5451,6 +5460,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5955,6 +5965,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5998,6 +6009,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6762,6 +6774,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7313,6 +7326,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_6_0_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7575,6 +7589,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index c605abc69ec..370c1c31a1b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -1178,6 +1178,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1574,6 +1575,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_1_0_2"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2178,6 +2180,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2507,6 +2510,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2937,6 +2941,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3018,6 +3023,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4674,6 +4680,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4994,6 +5001,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5376,6 +5384,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5449,6 +5458,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5953,6 +5963,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5996,6 +6007,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6760,6 +6772,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7311,6 +7324,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_6_0_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7573,6 +7587,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 2e5a8cb7831..ac1d32bafa3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -1173,6 +1173,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_6"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1565,6 +1566,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2165,6 +2167,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2492,6 +2495,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2920,6 +2924,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3000,6 +3005,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4646,6 +4652,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4962,6 +4969,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5088,6 +5096,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5336,6 +5345,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5409,6 +5419,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5912,6 +5923,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5953,6 +5965,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6647,6 +6660,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_0_4"; @@ -6710,6 +6724,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7258,6 +7273,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7512,6 +7528,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 49ffe8ca998..f5234f88368 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -1172,6 +1172,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_6"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1564,6 +1565,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2164,6 +2166,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2491,6 +2494,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2919,6 +2923,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2999,6 +3004,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4642,6 +4648,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4957,6 +4964,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5083,6 +5091,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5331,6 +5340,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5404,6 +5414,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5905,6 +5916,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5946,6 +5958,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6640,6 +6653,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_0_5"; @@ -6702,6 +6716,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7250,6 +7265,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7502,6 +7518,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 8d25262d06f..8b83a3b3ae1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -1172,6 +1172,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_6"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1564,6 +1565,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2164,6 +2166,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2491,6 +2494,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2919,6 +2923,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2999,6 +3004,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4642,6 +4648,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4957,6 +4964,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5083,6 +5091,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5331,6 +5340,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5404,6 +5414,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5905,6 +5916,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5946,6 +5958,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6640,6 +6653,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_0_5"; @@ -6702,6 +6716,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7249,6 +7264,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7501,6 +7517,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 09ee9f75bc7..6316dfd77e5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -1172,6 +1172,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_6"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1564,6 +1565,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2164,6 +2166,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2491,6 +2494,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2919,6 +2923,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2999,6 +3004,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4640,6 +4646,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4955,6 +4962,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5081,6 +5089,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5329,6 +5338,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5402,6 +5412,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5902,6 +5913,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5943,6 +5955,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6637,6 +6650,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_0_5"; @@ -6699,6 +6713,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7246,6 +7261,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7498,6 +7514,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index d57e4395b7f..af45b6d7d95 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -1171,6 +1171,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1563,6 +1564,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2163,6 +2165,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2490,6 +2493,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2918,6 +2922,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2998,6 +3003,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4637,6 +4643,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4952,6 +4959,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5078,6 +5086,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5326,6 +5335,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5399,6 +5409,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5899,6 +5910,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5940,6 +5952,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6633,6 +6646,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_0_5"; @@ -6695,6 +6709,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7241,6 +7256,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7493,6 +7509,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 6984f2a75aa..54efbc0a9ee 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -1171,6 +1171,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1563,6 +1564,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2163,6 +2165,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2490,6 +2493,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2917,6 +2921,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2997,6 +3002,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4636,6 +4642,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4951,6 +4958,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5077,6 +5085,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5325,6 +5334,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5398,6 +5408,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5895,6 +5906,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5936,6 +5948,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6629,6 +6642,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_0_6"; @@ -6691,6 +6705,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7236,6 +7251,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7488,6 +7504,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index d4ea52a6107..2f69f9785d6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -1170,6 +1170,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1562,6 +1563,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2161,6 +2163,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2487,6 +2490,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2913,6 +2917,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2991,6 +2996,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -3570,6 +3576,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4628,6 +4635,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4943,6 +4951,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5068,6 +5077,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5316,6 +5326,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5389,6 +5400,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5886,6 +5898,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5927,6 +5940,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6620,6 +6634,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1"; @@ -6682,6 +6697,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7226,6 +7242,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7478,6 +7495,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 5896bd3e9e4..c5b5eba33de 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -1170,6 +1170,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1560,6 +1561,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2158,6 +2160,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2484,6 +2487,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2909,6 +2913,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2986,6 +2991,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -3564,6 +3570,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4621,6 +4628,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4936,6 +4944,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5061,6 +5070,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5309,6 +5319,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5382,6 +5393,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5878,6 +5890,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5919,6 +5932,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6611,6 +6625,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1"; @@ -6673,6 +6688,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7217,6 +7233,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7469,6 +7486,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 69e4ce40d8a..e828d012ed3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -1170,6 +1170,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1560,6 +1561,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2155,6 +2157,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2481,6 +2484,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2905,6 +2909,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2982,6 +2987,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -3559,6 +3565,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4615,6 +4622,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4930,6 +4938,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5055,6 +5064,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5303,6 +5313,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5376,6 +5387,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5871,6 +5883,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5912,6 +5925,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6603,6 +6617,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_1"; @@ -6665,6 +6680,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7209,6 +7225,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7460,6 +7477,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index cfc4ef62c87..795101af294 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -1170,6 +1170,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1560,6 +1561,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2155,6 +2157,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2481,6 +2484,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2905,6 +2909,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2982,6 +2987,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -3558,6 +3564,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4614,6 +4621,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4929,6 +4937,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5054,6 +5063,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5301,6 +5311,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5374,6 +5385,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5868,6 +5880,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5909,6 +5922,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6600,6 +6614,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6662,6 +6677,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7204,6 +7220,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7455,6 +7472,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 8ebeb751034..1e37ab41340 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -1177,6 +1177,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1573,6 +1574,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_1_0_2"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2175,6 +2177,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2504,6 +2507,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2934,6 +2938,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3015,6 +3020,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4670,6 +4676,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4990,6 +4997,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5372,6 +5380,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5445,6 +5454,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5949,6 +5959,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5991,6 +6002,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6755,6 +6767,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7306,6 +7319,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_6_0_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7568,6 +7582,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 8ac3889480a..6f486e10294 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -1170,6 +1170,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1560,6 +1561,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2153,6 +2155,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2479,6 +2482,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2903,6 +2907,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2979,6 +2984,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -3555,6 +3561,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4610,6 +4617,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4925,6 +4933,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_4"; "language-kort" = dontDistribute super."language-kort"; @@ -5050,6 +5059,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5297,6 +5307,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5370,6 +5381,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5864,6 +5876,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5905,6 +5918,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6595,6 +6609,7 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_5"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6657,6 +6672,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7198,6 +7214,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7449,6 +7466,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 759916b5bff..407c6533760 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -1170,6 +1170,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1560,6 +1561,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2153,6 +2155,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2479,6 +2482,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2903,6 +2907,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2979,6 +2984,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -3554,6 +3560,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4609,6 +4616,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4924,6 +4932,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -5048,6 +5057,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5295,6 +5305,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5368,6 +5379,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5862,6 +5874,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5903,6 +5916,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6591,6 +6605,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6653,6 +6668,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7194,6 +7210,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7445,6 +7462,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 44e259e6297..29afcdc0f17 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -1169,6 +1169,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1559,6 +1560,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2152,6 +2154,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2478,6 +2481,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2902,6 +2906,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2978,6 +2983,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -3553,6 +3559,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4607,6 +4614,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4921,6 +4929,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -5045,6 +5054,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5292,6 +5302,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5365,6 +5376,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5858,6 +5870,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5899,6 +5912,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6587,6 +6601,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6649,6 +6664,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7190,6 +7206,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7441,6 +7458,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index b8506e1e215..b038a33d90c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -1177,6 +1177,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1573,6 +1574,7 @@ self: super: { "binary-list" = doDistribute super."binary-list_1_1_0_2"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2175,6 +2177,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2504,6 +2507,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2934,6 +2938,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3014,6 +3019,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4668,6 +4674,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4988,6 +4995,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5370,6 +5378,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5443,6 +5452,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5947,6 +5957,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5989,6 +6000,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6753,6 +6765,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7303,6 +7316,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_6_0_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7565,6 +7579,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 7014ac112e1..8067758d331 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -1177,6 +1177,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1572,6 +1573,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2174,6 +2176,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2503,6 +2506,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2933,6 +2937,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3013,6 +3018,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4667,6 +4673,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4987,6 +4994,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5368,6 +5376,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5441,6 +5450,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5945,6 +5955,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5986,6 +5997,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6748,6 +6760,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7298,6 +7311,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_6_0_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7560,6 +7574,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 29b158cc608..dacae57c949 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -1177,6 +1177,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_5"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1572,6 +1573,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2174,6 +2176,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2502,6 +2505,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2932,6 +2936,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3012,6 +3017,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4666,6 +4672,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4986,6 +4993,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5366,6 +5374,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5439,6 +5448,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5943,6 +5953,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5984,6 +5995,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6746,6 +6758,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7296,6 +7309,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_6_0_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7557,6 +7571,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 29fee926202..d1b359f7e40 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -1175,6 +1175,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_6"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1569,6 +1570,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2171,6 +2173,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2499,6 +2502,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2929,6 +2933,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3009,6 +3014,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4661,6 +4667,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4981,6 +4988,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5361,6 +5369,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5434,6 +5443,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5937,6 +5947,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5978,6 +5989,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6740,6 +6752,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7290,6 +7303,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_6_0_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7551,6 +7565,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 36df825eef2..386c514424a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -1174,6 +1174,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_6"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1568,6 +1569,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2170,6 +2172,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2498,6 +2501,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2928,6 +2932,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3008,6 +3013,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4660,6 +4666,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4980,6 +4987,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5360,6 +5368,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5433,6 +5442,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5936,6 +5946,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5977,6 +5988,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6739,6 +6751,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7289,6 +7302,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_6_0_1"; "stackage-build-plan" = dontDistribute super."stackage-build-plan"; "stackage-cabal" = dontDistribute super."stackage-cabal"; @@ -7550,6 +7564,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 1bc676364ae..ddf1e714dbb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -1173,6 +1173,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_6"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1567,6 +1568,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2169,6 +2171,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2497,6 +2500,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2927,6 +2931,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3007,6 +3012,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4657,6 +4663,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4976,6 +4983,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5356,6 +5364,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5429,6 +5438,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5932,6 +5942,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5973,6 +5984,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6735,6 +6747,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7283,6 +7296,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7542,6 +7556,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index a5cbd941506..a5cc8877cf6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -1173,6 +1173,7 @@ self: super: { "al" = dontDistribute super."al"; "alarmclock" = doDistribute super."alarmclock_0_2_0_6"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1565,6 +1566,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-search" = dontDistribute super."binary-search"; @@ -2166,6 +2168,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_1"; @@ -2494,6 +2497,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2922,6 +2926,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3002,6 +3007,7 @@ self: super: { "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; "file-location" = doDistribute super."file-location_0_4_7_1"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filelock" = dontDistribute super."filelock"; @@ -4649,6 +4655,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4968,6 +4975,7 @@ self: super: { "language-glsl" = doDistribute super."language-glsl_0_1_1"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-javascript" = doDistribute super."language-javascript_0_5_13_3"; "language-kort" = dontDistribute super."language-kort"; @@ -5346,6 +5354,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5419,6 +5428,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5922,6 +5932,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5963,6 +5974,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6723,6 +6735,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -7271,6 +7284,7 @@ self: super: { "stack" = dontDistribute super."stack"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; @@ -7526,6 +7540,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = dontDistribute super."tasty-rerun"; "tasty-silver" = dontDistribute super."tasty-silver"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 2ddaf719077..15d31b6de23 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -1143,6 +1143,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1510,6 +1511,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2078,6 +2080,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2398,6 +2401,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2801,6 +2805,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_4_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2874,6 +2879,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed" = doDistribute super."file-embed_0_0_8_2"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3435,6 +3441,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4458,6 +4465,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4752,6 +4760,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4870,6 +4879,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5095,6 +5105,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5109,6 +5120,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5177,6 +5189,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5651,6 +5664,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5691,6 +5705,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6363,6 +6378,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6424,6 +6440,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6950,6 +6967,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_3_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; @@ -7189,6 +7207,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7347,6 +7366,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 26263e23f01..0d985079e1a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -1142,6 +1142,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1508,6 +1509,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2076,6 +2078,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2396,6 +2399,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2799,6 +2803,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_4_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2869,6 +2874,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3430,6 +3436,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4452,6 +4459,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4746,6 +4754,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4864,6 +4873,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5088,6 +5098,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5102,6 +5113,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5170,6 +5182,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5643,6 +5656,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5683,6 +5697,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6353,6 +6368,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6414,6 +6430,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6940,6 +6957,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_3_1"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; @@ -7179,6 +7197,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7337,6 +7356,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 34276d14e13..132915a05ca 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -1133,6 +1133,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1490,6 +1491,7 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2048,6 +2050,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2362,6 +2365,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2397,6 +2401,7 @@ self: super: { "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; @@ -2749,6 +2754,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2815,6 +2821,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3369,6 +3376,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4376,6 +4384,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4663,6 +4672,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4779,6 +4789,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -4998,6 +5009,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5012,6 +5024,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5079,6 +5092,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5545,6 +5559,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5584,6 +5599,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6236,6 +6252,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6296,6 +6313,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6806,6 +6824,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_6_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7030,6 +7049,7 @@ self: super: { "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; "tasty-html" = dontDistribute super."tasty-html"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7037,6 +7057,7 @@ self: super: { "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7193,6 +7214,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 79197a6531b..59fe8b9bac8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -1133,6 +1133,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1489,6 +1490,7 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2044,6 +2046,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2358,6 +2361,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2393,6 +2397,7 @@ self: super: { "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; @@ -2744,6 +2749,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2810,6 +2816,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3363,6 +3370,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4368,6 +4376,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4655,6 +4664,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4771,6 +4781,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -4990,6 +5001,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5004,6 +5016,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5071,6 +5084,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5537,6 +5551,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5576,6 +5591,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6226,6 +6242,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6286,6 +6303,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6794,6 +6812,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_6_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7017,6 +7036,7 @@ self: super: { "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; "tasty-html" = dontDistribute super."tasty-html"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7024,6 +7044,7 @@ self: super: { "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7180,6 +7201,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 2b3876c69f6..9d134f77663 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -1131,6 +1131,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1487,6 +1488,7 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2038,6 +2040,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2352,6 +2355,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2387,6 +2391,7 @@ self: super: { "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; @@ -2690,6 +2695,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2_1"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2737,6 +2743,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2803,6 +2810,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3355,6 +3363,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4359,6 +4368,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4646,6 +4656,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4762,6 +4773,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -4981,6 +4993,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -4995,6 +5008,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5062,6 +5076,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5527,6 +5542,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5566,6 +5582,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6215,6 +6232,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6275,6 +6293,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6783,6 +6802,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_6_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7005,6 +7025,7 @@ self: super: { "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; "tasty-html" = dontDistribute super."tasty-html"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7012,6 +7033,7 @@ self: super: { "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7166,6 +7188,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 40c3d46d90b..9376f15df7c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -1131,6 +1131,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1487,6 +1488,7 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2038,6 +2040,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2352,6 +2355,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2387,6 +2391,7 @@ self: super: { "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; @@ -2690,6 +2695,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2_1"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2737,6 +2743,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2803,6 +2810,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3355,6 +3363,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4358,6 +4367,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4645,6 +4655,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4760,6 +4771,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -4979,6 +4991,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -4993,6 +5006,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5060,6 +5074,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5524,6 +5539,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5563,6 +5579,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6211,6 +6228,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6271,6 +6289,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6779,6 +6798,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_6_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7000,6 +7020,7 @@ self: super: { "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; "tasty-html" = dontDistribute super."tasty-html"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7007,6 +7028,7 @@ self: super: { "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7161,6 +7183,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 581148bf826..595b86f3693 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -1128,6 +1128,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1484,6 +1485,7 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2034,6 +2036,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2347,6 +2350,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2380,6 +2384,7 @@ self: super: { "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; @@ -2680,6 +2685,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2_1"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2727,6 +2733,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2793,6 +2800,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3345,6 +3353,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4346,6 +4355,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4633,6 +4643,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4748,6 +4759,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -4966,6 +4978,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -4980,6 +4993,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5047,6 +5061,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5510,6 +5525,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5549,6 +5565,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6194,6 +6211,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6254,6 +6272,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6762,6 +6781,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_6_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -6983,12 +7003,14 @@ self: super: { "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; "tasty-html" = dontDistribute super."tasty-html"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7143,6 +7165,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 009aedf2da0..8fd54e6be80 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -1127,6 +1127,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1483,6 +1484,7 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2033,6 +2035,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2346,6 +2349,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2379,6 +2383,7 @@ self: super: { "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; @@ -2679,6 +2684,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2_1"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2726,6 +2732,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2792,6 +2799,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3343,6 +3351,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4340,6 +4349,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4627,6 +4637,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4742,6 +4753,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -4960,6 +4972,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -4974,6 +4987,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5041,6 +5055,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5504,6 +5519,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5542,6 +5558,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6186,6 +6203,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6246,6 +6264,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6752,6 +6771,7 @@ self: super: { "stable-tree" = dontDistribute super."stable-tree"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -6973,12 +6993,14 @@ self: super: { "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; "tasty-html" = dontDistribute super."tasty-html"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7132,6 +7154,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix new file mode 100644 index 00000000000..518e6f71ef2 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -0,0 +1,7941 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # core libraries provided by the compiler + Cabal = null; + array = null; + base = null; + bin-package-db = null; + binary = null; + bytestring = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-prim = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + time = null; + transformers = null; + unix = null; + + # lts-3.16 packages + "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; + "3dmodels" = dontDistribute super."3dmodels"; + "4Blocks" = dontDistribute super."4Blocks"; + "AAI" = dontDistribute super."AAI"; + "ABList" = dontDistribute super."ABList"; + "AC-Angle" = dontDistribute super."AC-Angle"; + "AC-Boolean" = dontDistribute super."AC-Boolean"; + "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; + "AC-Colour" = dontDistribute super."AC-Colour"; + "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; + "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; + "AC-MiniTest" = dontDistribute super."AC-MiniTest"; + "AC-PPM" = dontDistribute super."AC-PPM"; + "AC-Random" = dontDistribute super."AC-Random"; + "AC-Terminal" = dontDistribute super."AC-Terminal"; + "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; + "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; + "ACME" = dontDistribute super."ACME"; + "ADPfusion" = dontDistribute super."ADPfusion"; + "AERN-Basics" = dontDistribute super."AERN-Basics"; + "AERN-Net" = dontDistribute super."AERN-Net"; + "AERN-Real" = dontDistribute super."AERN-Real"; + "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; + "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; + "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; + "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; + "AES" = dontDistribute super."AES"; + "AGI" = dontDistribute super."AGI"; + "ALUT" = dontDistribute super."ALUT"; + "AMI" = dontDistribute super."AMI"; + "ANum" = dontDistribute super."ANum"; + "ASN1" = dontDistribute super."ASN1"; + "AVar" = dontDistribute super."AVar"; + "AWin32Console" = dontDistribute super."AWin32Console"; + "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; + "AbortT-mtl" = dontDistribute super."AbortT-mtl"; + "AbortT-transformers" = dontDistribute super."AbortT-transformers"; + "ActionKid" = dontDistribute super."ActionKid"; + "Adaptive" = dontDistribute super."Adaptive"; + "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; + "Advgame" = dontDistribute super."Advgame"; + "AesonBson" = dontDistribute super."AesonBson"; + "Agata" = dontDistribute super."Agata"; + "Agda-executable" = dontDistribute super."Agda-executable"; + "AhoCorasick" = dontDistribute super."AhoCorasick"; + "AlgorithmW" = dontDistribute super."AlgorithmW"; + "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; + "Allure" = dontDistribute super."Allure"; + "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; + "Animas" = dontDistribute super."Animas"; + "Annotations" = dontDistribute super."Annotations"; + "Ansi2Html" = dontDistribute super."Ansi2Html"; + "ApplePush" = dontDistribute super."ApplePush"; + "AppleScript" = dontDistribute super."AppleScript"; + "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; + "ArrayRef" = dontDistribute super."ArrayRef"; + "ArrowVHDL" = dontDistribute super."ArrowVHDL"; + "AspectAG" = dontDistribute super."AspectAG"; + "AttoBencode" = dontDistribute super."AttoBencode"; + "AttoJson" = dontDistribute super."AttoJson"; + "Attrac" = dontDistribute super."Attrac"; + "Aurochs" = dontDistribute super."Aurochs"; + "AutoForms" = dontDistribute super."AutoForms"; + "AvlTree" = dontDistribute super."AvlTree"; + "BASIC" = dontDistribute super."BASIC"; + "BCMtools" = dontDistribute super."BCMtools"; + "BNFC" = dontDistribute super."BNFC"; + "BNFC-meta" = dontDistribute super."BNFC-meta"; + "Baggins" = dontDistribute super."Baggins"; + "Bang" = dontDistribute super."Bang"; + "Barracuda" = dontDistribute super."Barracuda"; + "Befunge93" = dontDistribute super."Befunge93"; + "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; + "BerkeleyDB" = dontDistribute super."BerkeleyDB"; + "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; + "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; + "BigPixel" = dontDistribute super."BigPixel"; + "Binpack" = dontDistribute super."Binpack"; + "Biobase" = dontDistribute super."Biobase"; + "BiobaseBlast" = dontDistribute super."BiobaseBlast"; + "BiobaseDotP" = dontDistribute super."BiobaseDotP"; + "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; + "BiobaseFasta" = dontDistribute super."BiobaseFasta"; + "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; + "BiobaseMAF" = dontDistribute super."BiobaseMAF"; + "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; + "BiobaseTurner" = dontDistribute super."BiobaseTurner"; + "BiobaseTypes" = dontDistribute super."BiobaseTypes"; + "BiobaseVienna" = dontDistribute super."BiobaseVienna"; + "BiobaseXNA" = dontDistribute super."BiobaseXNA"; + "BirdPP" = dontDistribute super."BirdPP"; + "BitSyntax" = dontDistribute super."BitSyntax"; + "Bitly" = dontDistribute super."Bitly"; + "Blobs" = dontDistribute super."Blobs"; + "BluePrintCSS" = dontDistribute super."BluePrintCSS"; + "Blueprint" = dontDistribute super."Blueprint"; + "Bookshelf" = dontDistribute super."Bookshelf"; + "Bravo" = dontDistribute super."Bravo"; + "BufferedSocket" = dontDistribute super."BufferedSocket"; + "Buster" = dontDistribute super."Buster"; + "CBOR" = dontDistribute super."CBOR"; + "CC-delcont" = dontDistribute super."CC-delcont"; + "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; + "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; + "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; + "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; + "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; + "CCA" = dontDistribute super."CCA"; + "CHXHtml" = dontDistribute super."CHXHtml"; + "CLASE" = dontDistribute super."CLASE"; + "CLI" = dontDistribute super."CLI"; + "CMCompare" = dontDistribute super."CMCompare"; + "CMQ" = dontDistribute super."CMQ"; + "COrdering" = dontDistribute super."COrdering"; + "CPBrainfuck" = dontDistribute super."CPBrainfuck"; + "CPL" = dontDistribute super."CPL"; + "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; + "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; + "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; + "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; + "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; + "CSPM-cspm" = dontDistribute super."CSPM-cspm"; + "CTRex" = dontDistribute super."CTRex"; + "CV" = dontDistribute super."CV"; + "CabalSearch" = dontDistribute super."CabalSearch"; + "Capabilities" = dontDistribute super."Capabilities"; + "Cardinality" = dontDistribute super."Cardinality"; + "CarneadesDSL" = dontDistribute super."CarneadesDSL"; + "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; + "Cartesian" = dontDistribute super."Cartesian"; + "Cascade" = dontDistribute super."Cascade"; + "Catana" = dontDistribute super."Catana"; + "Chart-gtk" = dontDistribute super."Chart-gtk"; + "Chart-simple" = dontDistribute super."Chart-simple"; + "CheatSheet" = dontDistribute super."CheatSheet"; + "Checked" = dontDistribute super."Checked"; + "Chitra" = dontDistribute super."Chitra"; + "ChristmasTree" = dontDistribute super."ChristmasTree"; + "CirruParser" = dontDistribute super."CirruParser"; + "ClassLaws" = dontDistribute super."ClassLaws"; + "ClassyPrelude" = dontDistribute super."ClassyPrelude"; + "Clean" = dontDistribute super."Clean"; + "Clipboard" = dontDistribute super."Clipboard"; + "ClustalParser" = dontDistribute super."ClustalParser"; + "Coadjute" = dontDistribute super."Coadjute"; + "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; + "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; + "Combinatorrent" = dontDistribute super."Combinatorrent"; + "Command" = dontDistribute super."Command"; + "Commando" = dontDistribute super."Commando"; + "ComonadSheet" = dontDistribute super."ComonadSheet"; + "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; + "Concurrential" = dontDistribute super."Concurrential"; + "Condor" = dontDistribute super."Condor"; + "ConfigFileTH" = dontDistribute super."ConfigFileTH"; + "Configger" = dontDistribute super."Configger"; + "Configurable" = dontDistribute super."Configurable"; + "ConsStream" = dontDistribute super."ConsStream"; + "Conscript" = dontDistribute super."Conscript"; + "ConstraintKinds" = dontDistribute super."ConstraintKinds"; + "Consumer" = dontDistribute super."Consumer"; + "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; + "Contract" = dontDistribute super."Contract"; + "Control-Engine" = dontDistribute super."Control-Engine"; + "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; + "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; + "CoreDump" = dontDistribute super."CoreDump"; + "CoreErlang" = dontDistribute super."CoreErlang"; + "CoreFoundation" = dontDistribute super."CoreFoundation"; + "Coroutine" = dontDistribute super."Coroutine"; + "CouchDB" = dontDistribute super."CouchDB"; + "Craft3e" = dontDistribute super."Craft3e"; + "Crypto" = dontDistribute super."Crypto"; + "CurryDB" = dontDistribute super."CurryDB"; + "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; + "DBlimited" = dontDistribute super."DBlimited"; + "DBus" = dontDistribute super."DBus"; + "DCFL" = dontDistribute super."DCFL"; + "DMuCheck" = dontDistribute super."DMuCheck"; + "DOM" = dontDistribute super."DOM"; + "DP" = dontDistribute super."DP"; + "DPM" = dontDistribute super."DPM"; + "DSA" = dontDistribute super."DSA"; + "DSH" = dontDistribute super."DSH"; + "DSTM" = dontDistribute super."DSTM"; + "DTC" = dontDistribute super."DTC"; + "Dangerous" = dontDistribute super."Dangerous"; + "Dao" = dontDistribute super."Dao"; + "DarcsHelpers" = dontDistribute super."DarcsHelpers"; + "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; + "Data-Rope" = dontDistribute super."Data-Rope"; + "DataTreeView" = dontDistribute super."DataTreeView"; + "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; + "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; + "DecisionTree" = dontDistribute super."DecisionTree"; + "DeepArrow" = dontDistribute super."DeepArrow"; + "DefendTheKing" = dontDistribute super."DefendTheKing"; + "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; + "Dflow" = dontDistribute super."Dflow"; + "DifferenceLogic" = dontDistribute super."DifferenceLogic"; + "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; + "Digit" = dontDistribute super."Digit"; + "DigitalOcean" = dontDistribute super."DigitalOcean"; + "DimensionalHash" = dontDistribute super."DimensionalHash"; + "DirectSound" = dontDistribute super."DirectSound"; + "DisTract" = dontDistribute super."DisTract"; + "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; + "Dish" = dontDistribute super."Dish"; + "Dist" = dontDistribute super."Dist"; + "DistanceTransform" = dontDistribute super."DistanceTransform"; + "DistanceUnits" = dontDistribute super."DistanceUnits"; + "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; + "DocTest" = dontDistribute super."DocTest"; + "Docs" = dontDistribute super."Docs"; + "DrHylo" = dontDistribute super."DrHylo"; + "DrIFT" = dontDistribute super."DrIFT"; + "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; + "Dung" = dontDistribute super."Dung"; + "Dust" = dontDistribute super."Dust"; + "Dust-crypto" = dontDistribute super."Dust-crypto"; + "Dust-tools" = dontDistribute super."Dust-tools"; + "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; + "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; + "DysFRP" = dontDistribute super."DysFRP"; + "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; + "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; + "EEConfig" = dontDistribute super."EEConfig"; + "Earley" = doDistribute super."Earley_0_9_0"; + "Ebnf2ps" = dontDistribute super."Ebnf2ps"; + "EdisonAPI" = dontDistribute super."EdisonAPI"; + "EdisonCore" = dontDistribute super."EdisonCore"; + "EditTimeReport" = dontDistribute super."EditTimeReport"; + "EitherT" = dontDistribute super."EitherT"; + "Elm" = dontDistribute super."Elm"; + "Emping" = dontDistribute super."Emping"; + "Encode" = dontDistribute super."Encode"; + "EntrezHTTP" = dontDistribute super."EntrezHTTP"; + "EnumContainers" = dontDistribute super."EnumContainers"; + "EnumMap" = dontDistribute super."EnumMap"; + "Eq" = dontDistribute super."Eq"; + "EqualitySolver" = dontDistribute super."EqualitySolver"; + "EsounD" = dontDistribute super."EsounD"; + "EstProgress" = dontDistribute super."EstProgress"; + "EtaMOO" = dontDistribute super."EtaMOO"; + "Etage" = dontDistribute super."Etage"; + "Etage-Graph" = dontDistribute super."Etage-Graph"; + "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; + "Etherbunny" = dontDistribute super."Etherbunny"; + "EuroIT" = dontDistribute super."EuroIT"; + "Euterpea" = dontDistribute super."Euterpea"; + "EventSocket" = dontDistribute super."EventSocket"; + "Extra" = dontDistribute super."Extra"; + "FComp" = dontDistribute super."FComp"; + "FM-SBLEX" = dontDistribute super."FM-SBLEX"; + "FModExRaw" = dontDistribute super."FModExRaw"; + "FPretty" = dontDistribute super."FPretty"; + "FTGL" = dontDistribute super."FTGL"; + "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; + "FTPLine" = dontDistribute super."FTPLine"; + "Facts" = dontDistribute super."Facts"; + "FailureT" = dontDistribute super."FailureT"; + "FastxPipe" = dontDistribute super."FastxPipe"; + "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; + "FerryCore" = dontDistribute super."FerryCore"; + "Feval" = dontDistribute super."Feval"; + "FieldTrip" = dontDistribute super."FieldTrip"; + "FileManip" = dontDistribute super."FileManip"; + "FileManipCompat" = dontDistribute super."FileManipCompat"; + "FilePather" = dontDistribute super."FilePather"; + "FileSystem" = dontDistribute super."FileSystem"; + "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; + "Finance-Treasury" = dontDistribute super."Finance-Treasury"; + "FindBin" = dontDistribute super."FindBin"; + "FiniteMap" = dontDistribute super."FiniteMap"; + "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; + "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; + "Flippi" = dontDistribute super."Flippi"; + "Focus" = dontDistribute super."Focus"; + "Folly" = dontDistribute super."Folly"; + "ForSyDe" = dontDistribute super."ForSyDe"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "Fractaler" = dontDistribute super."Fractaler"; + "Frames" = dontDistribute super."Frames"; + "Frank" = dontDistribute super."Frank"; + "FreeTypeGL" = dontDistribute super."FreeTypeGL"; + "FunGEn" = dontDistribute super."FunGEn"; + "Fungi" = dontDistribute super."Fungi"; + "GA" = dontDistribute super."GA"; + "GGg" = dontDistribute super."GGg"; + "GHood" = dontDistribute super."GHood"; + "GLFW" = dontDistribute super."GLFW"; + "GLFW-OGL" = dontDistribute super."GLFW-OGL"; + "GLFW-b" = dontDistribute super."GLFW-b"; + "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLURaw" = dontDistribute super."GLURaw"; + "GLUT" = dontDistribute super."GLUT"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe" = dontDistribute super."GPipe"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; + "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; + "GTALib" = dontDistribute super."GTALib"; + "Gamgine" = dontDistribute super."Gamgine"; + "Ganymede" = dontDistribute super."Ganymede"; + "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; + "GeBoP" = dontDistribute super."GeBoP"; + "GenI" = dontDistribute super."GenI"; + "GenSmsPdu" = dontDistribute super."GenSmsPdu"; + "Genbank" = dontDistribute super."Genbank"; + "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; + "GenussFold" = dontDistribute super."GenussFold"; + "GeoIp" = dontDistribute super."GeoIp"; + "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; + "Geodetic" = dontDistribute super."Geodetic"; + "GeomPredicates" = dontDistribute super."GeomPredicates"; + "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; + "GiST" = dontDistribute super."GiST"; + "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "GlomeTrace" = dontDistribute super."GlomeTrace"; + "GlomeVec" = dontDistribute super."GlomeVec"; + "GlomeView" = dontDistribute super."GlomeView"; + "GoogleChart" = dontDistribute super."GoogleChart"; + "GoogleDirections" = dontDistribute super."GoogleDirections"; + "GoogleSB" = dontDistribute super."GoogleSB"; + "GoogleSuggest" = dontDistribute super."GoogleSuggest"; + "GoogleTranslate" = dontDistribute super."GoogleTranslate"; + "GotoT-transformers" = dontDistribute super."GotoT-transformers"; + "GrammarProducts" = dontDistribute super."GrammarProducts"; + "Graph500" = dontDistribute super."Graph500"; + "GraphHammer" = dontDistribute super."GraphHammer"; + "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; + "Graphalyze" = dontDistribute super."Graphalyze"; + "Grempa" = dontDistribute super."Grempa"; + "GroteTrap" = dontDistribute super."GroteTrap"; + "Grow" = dontDistribute super."Grow"; + "GrowlNotify" = dontDistribute super."GrowlNotify"; + "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; + "GtkGLTV" = dontDistribute super."GtkGLTV"; + "GtkTV" = dontDistribute super."GtkTV"; + "GuiHaskell" = dontDistribute super."GuiHaskell"; + "GuiTV" = dontDistribute super."GuiTV"; + "H" = dontDistribute super."H"; + "HARM" = dontDistribute super."HARM"; + "HAppS-Data" = dontDistribute super."HAppS-Data"; + "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; + "HAppS-Server" = dontDistribute super."HAppS-Server"; + "HAppS-State" = dontDistribute super."HAppS-State"; + "HAppS-Util" = dontDistribute super."HAppS-Util"; + "HAppSHelpers" = dontDistribute super."HAppSHelpers"; + "HCL" = dontDistribute super."HCL"; + "HCard" = dontDistribute super."HCard"; + "HDBC" = dontDistribute super."HDBC"; + "HDBC-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; + "HDRUtils" = dontDistribute super."HDRUtils"; + "HERA" = dontDistribute super."HERA"; + "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; + "HFuse" = dontDistribute super."HFuse"; + "HGL" = dontDistribute super."HGL"; + "HGamer3D" = dontDistribute super."HGamer3D"; + "HGamer3D-API" = dontDistribute super."HGamer3D-API"; + "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; + "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; + "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; + "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; + "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; + "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; + "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; + "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; + "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; + "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; + "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; + "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; + "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; + "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; + "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; + "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; + "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; + "HGraphStorage" = dontDistribute super."HGraphStorage"; + "HHDL" = dontDistribute super."HHDL"; + "HJScript" = dontDistribute super."HJScript"; + "HJVM" = dontDistribute super."HJVM"; + "HJavaScript" = dontDistribute super."HJavaScript"; + "HLearn-algebra" = dontDistribute super."HLearn-algebra"; + "HLearn-approximation" = dontDistribute super."HLearn-approximation"; + "HLearn-classification" = dontDistribute super."HLearn-classification"; + "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; + "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HListPP" = dontDistribute super."HListPP"; + "HLogger" = dontDistribute super."HLogger"; + "HMM" = dontDistribute super."HMM"; + "HMap" = dontDistribute super."HMap"; + "HNM" = dontDistribute super."HNM"; + "HODE" = dontDistribute super."HODE"; + "HOpenCV" = dontDistribute super."HOpenCV"; + "HPDF" = dontDistribute super."HPDF"; + "HPath" = dontDistribute super."HPath"; + "HPi" = dontDistribute super."HPi"; + "HPlot" = dontDistribute super."HPlot"; + "HPong" = dontDistribute super."HPong"; + "HROOT" = dontDistribute super."HROOT"; + "HROOT-core" = dontDistribute super."HROOT-core"; + "HROOT-graf" = dontDistribute super."HROOT-graf"; + "HROOT-hist" = dontDistribute super."HROOT-hist"; + "HROOT-io" = dontDistribute super."HROOT-io"; + "HROOT-math" = dontDistribute super."HROOT-math"; + "HRay" = dontDistribute super."HRay"; + "HSFFIG" = dontDistribute super."HSFFIG"; + "HSGEP" = dontDistribute super."HSGEP"; + "HSH" = dontDistribute super."HSH"; + "HSHHelpers" = dontDistribute super."HSHHelpers"; + "HSlippyMap" = dontDistribute super."HSlippyMap"; + "HSmarty" = dontDistribute super."HSmarty"; + "HSoundFile" = dontDistribute super."HSoundFile"; + "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; + "HSvm" = dontDistribute super."HSvm"; + "HTTP-Simple" = dontDistribute super."HTTP-Simple"; + "HTab" = dontDistribute super."HTab"; + "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit-Diff" = dontDistribute super."HUnit-Diff"; + "HUnit-Plus" = dontDistribute super."HUnit-Plus"; + "HUnit-approx" = dontDistribute super."HUnit-approx"; + "HXMPP" = dontDistribute super."HXMPP"; + "HXQ" = dontDistribute super."HXQ"; + "HaLeX" = dontDistribute super."HaLeX"; + "HaMinitel" = dontDistribute super."HaMinitel"; + "HaPy" = dontDistribute super."HaPy"; + "HaRe" = dontDistribute super."HaRe"; + "HaTeX-meta" = dontDistribute super."HaTeX-meta"; + "HaTeX-qq" = dontDistribute super."HaTeX-qq"; + "HaVSA" = dontDistribute super."HaVSA"; + "Hach" = dontDistribute super."Hach"; + "HackMail" = dontDistribute super."HackMail"; + "Haggressive" = dontDistribute super."Haggressive"; + "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; + "Hangman" = dontDistribute super."Hangman"; + "HarmTrace" = dontDistribute super."HarmTrace"; + "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; + "HasGP" = dontDistribute super."HasGP"; + "Haschoo" = dontDistribute super."Haschoo"; + "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; + "HaskellForMaths" = dontDistribute super."HaskellForMaths"; + "HaskellLM" = dontDistribute super."HaskellLM"; + "HaskellNN" = dontDistribute super."HaskellNN"; + "HaskellNet" = doDistribute super."HaskellNet_0_4_5"; + "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hawk" = dontDistribute super."Hawk"; + "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = dontDistribute super."Hclip"; + "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; + "Hermes" = dontDistribute super."Hermes"; + "Hieroglyph" = dontDistribute super."Hieroglyph"; + "HiggsSet" = dontDistribute super."HiggsSet"; + "Hipmunk" = dontDistribute super."Hipmunk"; + "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; + "Hish" = dontDistribute super."Hish"; + "Histogram" = dontDistribute super."Histogram"; + "Hmpf" = dontDistribute super."Hmpf"; + "Hoed" = dontDistribute super."Hoed"; + "HoleyMonoid" = dontDistribute super."HoleyMonoid"; + "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; + "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; + "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; + "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; + "Homology" = dontDistribute super."Homology"; + "HongoDB" = dontDistribute super."HongoDB"; + "HostAndPort" = dontDistribute super."HostAndPort"; + "Hricket" = dontDistribute super."Hricket"; + "Hs2lib" = dontDistribute super."Hs2lib"; + "HsASA" = dontDistribute super."HsASA"; + "HsHaruPDF" = dontDistribute super."HsHaruPDF"; + "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; + "HsJudy" = dontDistribute super."HsJudy"; + "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; + "HsParrot" = dontDistribute super."HsParrot"; + "HsPerl5" = dontDistribute super."HsPerl5"; + "HsSVN" = dontDistribute super."HsSVN"; + "HsSyck" = dontDistribute super."HsSyck"; + "HsTools" = dontDistribute super."HsTools"; + "Hsed" = dontDistribute super."Hsed"; + "Hsmtlib" = dontDistribute super."Hsmtlib"; + "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; + "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; + "IDynamic" = dontDistribute super."IDynamic"; + "IFS" = dontDistribute super."IFS"; + "INblobs" = dontDistribute super."INblobs"; + "IOR" = dontDistribute super."IOR"; + "IORefCAS" = dontDistribute super."IORefCAS"; + "IcoGrid" = dontDistribute super."IcoGrid"; + "Imlib" = dontDistribute super."Imlib"; + "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; + "IndentParser" = dontDistribute super."IndentParser"; + "IndexedList" = dontDistribute super."IndexedList"; + "InfixApplicative" = dontDistribute super."InfixApplicative"; + "Interpolation" = dontDistribute super."Interpolation"; + "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = dontDistribute super."IntervalMap"; + "Irc" = dontDistribute super."Irc"; + "IrrHaskell" = dontDistribute super."IrrHaskell"; + "IsNull" = dontDistribute super."IsNull"; + "JSON-Combinator" = dontDistribute super."JSON-Combinator"; + "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; + "JSONb" = dontDistribute super."JSONb"; + "JYU-Utils" = dontDistribute super."JYU-Utils"; + "JackMiniMix" = dontDistribute super."JackMiniMix"; + "Javasf" = dontDistribute super."Javasf"; + "Javav" = dontDistribute super."Javav"; + "JsContracts" = dontDistribute super."JsContracts"; + "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; + "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; + "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; + "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; + "JunkDB" = dontDistribute super."JunkDB"; + "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; + "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; + "JustParse" = dontDistribute super."JustParse"; + "KMP" = dontDistribute super."KMP"; + "KSP" = dontDistribute super."KSP"; + "Kalman" = dontDistribute super."Kalman"; + "KdTree" = dontDistribute super."KdTree"; + "Ketchup" = dontDistribute super."Ketchup"; + "KiCS" = dontDistribute super."KiCS"; + "KiCS-debugger" = dontDistribute super."KiCS-debugger"; + "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; + "Kleislify" = dontDistribute super."Kleislify"; + "Konf" = dontDistribute super."Konf"; + "KyotoCabinet" = dontDistribute super."KyotoCabinet"; + "L-seed" = dontDistribute super."L-seed"; + "LDAP" = dontDistribute super."LDAP"; + "LRU" = dontDistribute super."LRU"; + "LTree" = dontDistribute super."LTree"; + "LambdaCalculator" = dontDistribute super."LambdaCalculator"; + "LambdaHack" = dontDistribute super."LambdaHack"; + "LambdaINet" = dontDistribute super."LambdaINet"; + "LambdaNet" = dontDistribute super."LambdaNet"; + "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; + "LambdaShell" = dontDistribute super."LambdaShell"; + "Lambdajudge" = dontDistribute super."Lambdajudge"; + "Lambdaya" = dontDistribute super."Lambdaya"; + "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; + "Lastik" = dontDistribute super."Lastik"; + "Lattices" = dontDistribute super."Lattices"; + "LazyVault" = dontDistribute super."LazyVault"; + "Level0" = dontDistribute super."Level0"; + "LibClang" = dontDistribute super."LibClang"; + "LibZip" = dontDistribute super."LibZip"; + "Limit" = dontDistribute super."Limit"; + "LinearSplit" = dontDistribute super."LinearSplit"; + "LinkChecker" = dontDistribute super."LinkChecker"; + "ListTree" = dontDistribute super."ListTree"; + "ListWriter" = dontDistribute super."ListWriter"; + "ListZipper" = dontDistribute super."ListZipper"; + "Logic" = dontDistribute super."Logic"; + "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; + "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; + "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; + "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; + "LslPlus" = dontDistribute super."LslPlus"; + "Lucu" = dontDistribute super."Lucu"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "MFlow" = dontDistribute super."MFlow"; + "MHask" = dontDistribute super."MHask"; + "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; + "MagicHaskeller" = dontDistribute super."MagicHaskeller"; + "MailchimpSimple" = dontDistribute super."MailchimpSimple"; + "MaybeT" = dontDistribute super."MaybeT"; + "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; + "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; + "MazesOfMonad" = dontDistribute super."MazesOfMonad"; + "MeanShift" = dontDistribute super."MeanShift"; + "Measure" = dontDistribute super."Measure"; + "MetaHDBC" = dontDistribute super."MetaHDBC"; + "MetaObject" = dontDistribute super."MetaObject"; + "Metrics" = dontDistribute super."Metrics"; + "Mhailist" = dontDistribute super."Mhailist"; + "Michelangelo" = dontDistribute super."Michelangelo"; + "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; + "MiniAgda" = dontDistribute super."MiniAgda"; + "MissingK" = dontDistribute super."MissingK"; + "MissingM" = dontDistribute super."MissingM"; + "MissingPy" = dontDistribute super."MissingPy"; + "Modulo" = dontDistribute super."Modulo"; + "Moe" = dontDistribute super."Moe"; + "MoeDict" = dontDistribute super."MoeDict"; + "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; + "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; + "MonadCompose" = dontDistribute super."MonadCompose"; + "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; + "MonadStack" = dontDistribute super."MonadStack"; + "Monadius" = dontDistribute super."Monadius"; + "Monaris" = dontDistribute super."Monaris"; + "Monatron" = dontDistribute super."Monatron"; + "Monatron-IO" = dontDistribute super."Monatron-IO"; + "Monocle" = dontDistribute super."Monocle"; + "MorseCode" = dontDistribute super."MorseCode"; + "MuCheck" = dontDistribute super."MuCheck"; + "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; + "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; + "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; + "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; + "Munkres" = dontDistribute super."Munkres"; + "Munkres-simple" = dontDistribute super."Munkres-simple"; + "MusicBrainz" = dontDistribute super."MusicBrainz"; + "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; + "MyPrimes" = dontDistribute super."MyPrimes"; + "NGrams" = dontDistribute super."NGrams"; + "NTRU" = dontDistribute super."NTRU"; + "NXT" = dontDistribute super."NXT"; + "NXTDSL" = dontDistribute super."NXTDSL"; + "NanoProlog" = dontDistribute super."NanoProlog"; + "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; + "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; + "Neks" = dontDistribute super."Neks"; + "NestedFunctor" = dontDistribute super."NestedFunctor"; + "NestedSampling" = dontDistribute super."NestedSampling"; + "NetSNMP" = dontDistribute super."NetSNMP"; + "NewBinary" = dontDistribute super."NewBinary"; + "Ninjas" = dontDistribute super."Ninjas"; + "NoSlow" = dontDistribute super."NoSlow"; + "NoTrace" = dontDistribute super."NoTrace"; + "Noise" = dontDistribute super."Noise"; + "Nomyx" = dontDistribute super."Nomyx"; + "Nomyx-Core" = dontDistribute super."Nomyx-Core"; + "Nomyx-Language" = dontDistribute super."Nomyx-Language"; + "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; + "Nomyx-Web" = dontDistribute super."Nomyx-Web"; + "NonEmpty" = dontDistribute super."NonEmpty"; + "NonEmptyList" = dontDistribute super."NonEmptyList"; + "NumLazyByteString" = dontDistribute super."NumLazyByteString"; + "NumberSieves" = dontDistribute super."NumberSieves"; + "Numbers" = dontDistribute super."Numbers"; + "Nussinov78" = dontDistribute super."Nussinov78"; + "Nutri" = dontDistribute super."Nutri"; + "OGL" = dontDistribute super."OGL"; + "OSM" = dontDistribute super."OSM"; + "OTP" = dontDistribute super."OTP"; + "Object" = dontDistribute super."Object"; + "ObjectIO" = dontDistribute super."ObjectIO"; + "ObjectName" = dontDistribute super."ObjectName"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OpenAFP" = dontDistribute super."OpenAFP"; + "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; + "OpenAL" = dontDistribute super."OpenAL"; + "OpenCL" = dontDistribute super."OpenCL"; + "OpenCLRaw" = dontDistribute super."OpenCLRaw"; + "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = dontDistribute super."OpenGL"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = dontDistribute super."OpenGLRaw"; + "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; + "OpenSCAD" = dontDistribute super."OpenSCAD"; + "OpenVG" = dontDistribute super."OpenVG"; + "OpenVGRaw" = dontDistribute super."OpenVGRaw"; + "Operads" = dontDistribute super."Operads"; + "OptDir" = dontDistribute super."OptDir"; + "OrPatterns" = dontDistribute super."OrPatterns"; + "OrchestrateDB" = dontDistribute super."OrchestrateDB"; + "OrderedBits" = dontDistribute super."OrderedBits"; + "Ordinals" = dontDistribute super."Ordinals"; + "PArrows" = dontDistribute super."PArrows"; + "PBKDF2" = dontDistribute super."PBKDF2"; + "PCLT" = dontDistribute super."PCLT"; + "PCLT-DB" = dontDistribute super."PCLT-DB"; + "PDBtools" = dontDistribute super."PDBtools"; + "PTQ" = dontDistribute super."PTQ"; + "PageIO" = dontDistribute super."PageIO"; + "Paillier" = dontDistribute super."Paillier"; + "PandocAgda" = dontDistribute super."PandocAgda"; + "Paraiso" = dontDistribute super."Paraiso"; + "Parry" = dontDistribute super."Parry"; + "ParsecTools" = dontDistribute super."ParsecTools"; + "ParserFunction" = dontDistribute super."ParserFunction"; + "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; + "PasswordGenerator" = dontDistribute super."PasswordGenerator"; + "PastePipe" = dontDistribute super."PastePipe"; + "Pathfinder" = dontDistribute super."Pathfinder"; + "Peano" = dontDistribute super."Peano"; + "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; + "PerfectHash" = dontDistribute super."PerfectHash"; + "PermuteEffects" = dontDistribute super."PermuteEffects"; + "Phsu" = dontDistribute super."Phsu"; + "Pipe" = dontDistribute super."Pipe"; + "Piso" = dontDistribute super."Piso"; + "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; + "PlayingCards" = dontDistribute super."PlayingCards"; + "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; + "PlslTools" = dontDistribute super."PlslTools"; + "Plural" = dontDistribute super."Plural"; + "Pollutocracy" = dontDistribute super."Pollutocracy"; + "PortFusion" = dontDistribute super."PortFusion"; + "PortMidi" = dontDistribute super."PortMidi"; + "PostgreSQL" = dontDistribute super."PostgreSQL"; + "PrimitiveArray" = dontDistribute super."PrimitiveArray"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "Quickson" = dontDistribute super."Quickson"; + "R-pandoc" = dontDistribute super."R-pandoc"; + "RANSAC" = dontDistribute super."RANSAC"; + "RBTree" = dontDistribute super."RBTree"; + "RESTng" = dontDistribute super."RESTng"; + "RFC1751" = dontDistribute super."RFC1751"; + "RJson" = dontDistribute super."RJson"; + "RMP" = dontDistribute super."RMP"; + "RNAFold" = dontDistribute super."RNAFold"; + "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; + "RNAdesign" = dontDistribute super."RNAdesign"; + "RNAdraw" = dontDistribute super."RNAdraw"; + "RNAlien" = dontDistribute super."RNAlien"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "RSA" = doDistribute super."RSA_2_1_0_3"; + "Raincat" = dontDistribute super."Raincat"; + "Random123" = dontDistribute super."Random123"; + "RandomDotOrg" = dontDistribute super."RandomDotOrg"; + "Randometer" = dontDistribute super."Randometer"; + "Range" = dontDistribute super."Range"; + "Ranged-sets" = dontDistribute super."Ranged-sets"; + "Ranka" = dontDistribute super."Ranka"; + "Rasenschach" = dontDistribute super."Rasenschach"; + "Redmine" = dontDistribute super."Redmine"; + "Ref" = dontDistribute super."Ref"; + "Referees" = dontDistribute super."Referees"; + "RepLib" = dontDistribute super."RepLib"; + "ReplicateEffects" = dontDistribute super."ReplicateEffects"; + "ReviewBoard" = dontDistribute super."ReviewBoard"; + "RichConditional" = dontDistribute super."RichConditional"; + "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; + "RxHaskell" = dontDistribute super."RxHaskell"; + "SBench" = dontDistribute super."SBench"; + "SConfig" = dontDistribute super."SConfig"; + "SDL" = dontDistribute super."SDL"; + "SDL-gfx" = dontDistribute super."SDL-gfx"; + "SDL-image" = dontDistribute super."SDL-image"; + "SDL-mixer" = dontDistribute super."SDL-mixer"; + "SDL-mpeg" = dontDistribute super."SDL-mpeg"; + "SDL-ttf" = dontDistribute super."SDL-ttf"; + "SDL2-ttf" = dontDistribute super."SDL2-ttf"; + "SFML" = dontDistribute super."SFML"; + "SFML-control" = dontDistribute super."SFML-control"; + "SFont" = dontDistribute super."SFont"; + "SG" = dontDistribute super."SG"; + "SGdemo" = dontDistribute super."SGdemo"; + "SHA2" = dontDistribute super."SHA2"; + "SMTPClient" = dontDistribute super."SMTPClient"; + "SNet" = dontDistribute super."SNet"; + "SQLDeps" = dontDistribute super."SQLDeps"; + "STL" = dontDistribute super."STL"; + "SVG2Q" = dontDistribute super."SVG2Q"; + "SVGPath" = dontDistribute super."SVGPath"; + "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; + "SableCC2Hs" = dontDistribute super."SableCC2Hs"; + "Safe" = dontDistribute super."Safe"; + "Salsa" = dontDistribute super."Salsa"; + "Saturnin" = dontDistribute super."Saturnin"; + "SciFlow" = dontDistribute super."SciFlow"; + "ScratchFs" = dontDistribute super."ScratchFs"; + "Scurry" = dontDistribute super."Scurry"; + "SegmentTree" = dontDistribute super."SegmentTree"; + "Semantique" = dontDistribute super."Semantique"; + "Semigroup" = dontDistribute super."Semigroup"; + "SeqAlign" = dontDistribute super."SeqAlign"; + "SessionLogger" = dontDistribute super."SessionLogger"; + "ShellCheck" = dontDistribute super."ShellCheck"; + "Shellac" = dontDistribute super."Shellac"; + "Shellac-compatline" = dontDistribute super."Shellac-compatline"; + "Shellac-editline" = dontDistribute super."Shellac-editline"; + "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; + "Shellac-readline" = dontDistribute super."Shellac-readline"; + "ShowF" = dontDistribute super."ShowF"; + "Shrub" = dontDistribute super."Shrub"; + "Shu-thing" = dontDistribute super."Shu-thing"; + "SimpleAES" = dontDistribute super."SimpleAES"; + "SimpleEA" = dontDistribute super."SimpleEA"; + "SimpleGL" = dontDistribute super."SimpleGL"; + "SimpleH" = dontDistribute super."SimpleH"; + "SimpleLog" = dontDistribute super."SimpleLog"; + "SizeCompare" = dontDistribute super."SizeCompare"; + "Slides" = dontDistribute super."Slides"; + "Smooth" = dontDistribute super."Smooth"; + "SmtLib" = dontDistribute super."SmtLib"; + "Snusmumrik" = dontDistribute super."Snusmumrik"; + "SoOSiM" = dontDistribute super."SoOSiM"; + "SoccerFun" = dontDistribute super."SoccerFun"; + "SoccerFunGL" = dontDistribute super."SoccerFunGL"; + "Sonnex" = dontDistribute super."Sonnex"; + "SourceGraph" = dontDistribute super."SourceGraph"; + "Southpaw" = dontDistribute super."Southpaw"; + "SpaceInvaders" = dontDistribute super."SpaceInvaders"; + "SpacePrivateers" = dontDistribute super."SpacePrivateers"; + "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock" = doDistribute super."Spock_0_8_1_0"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar-transformer" = dontDistribute super."StateVar-transformer"; + "StatisticalMethods" = dontDistribute super."StatisticalMethods"; + "Stomp" = dontDistribute super."Stomp"; + "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; + "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; + "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "StrictBench" = dontDistribute super."StrictBench"; + "SuffixStructures" = dontDistribute super."SuffixStructures"; + "SybWidget" = dontDistribute super."SybWidget"; + "SyntaxMacros" = dontDistribute super."SyntaxMacros"; + "Sysmon" = dontDistribute super."Sysmon"; + "TBC" = dontDistribute super."TBC"; + "TBit" = dontDistribute super."TBit"; + "THEff" = dontDistribute super."THEff"; + "TTTAS" = dontDistribute super."TTTAS"; + "TV" = dontDistribute super."TV"; + "TYB" = dontDistribute super."TYB"; + "TableAlgebra" = dontDistribute super."TableAlgebra"; + "Tables" = dontDistribute super."Tables"; + "Tablify" = dontDistribute super."Tablify"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "Taxonomy" = dontDistribute super."Taxonomy"; + "TaxonomyTools" = dontDistribute super."TaxonomyTools"; + "TeaHS" = dontDistribute super."TeaHS"; + "Tensor" = dontDistribute super."Tensor"; + "TernaryTrees" = dontDistribute super."TernaryTrees"; + "TestExplode" = dontDistribute super."TestExplode"; + "Theora" = dontDistribute super."Theora"; + "Thingie" = dontDistribute super."Thingie"; + "ThreadObjects" = dontDistribute super."ThreadObjects"; + "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; + "TicTacToe" = dontDistribute super."TicTacToe"; + "TigerHash" = dontDistribute super."TigerHash"; + "TimePiece" = dontDistribute super."TimePiece"; + "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; + "TinyURL" = dontDistribute super."TinyURL"; + "Titim" = dontDistribute super."Titim"; + "Top" = dontDistribute super."Top"; + "Tournament" = dontDistribute super."Tournament"; + "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; + "Transhare" = dontDistribute super."Transhare"; + "TreeCounter" = dontDistribute super."TreeCounter"; + "TreeStructures" = dontDistribute super."TreeStructures"; + "TreeT" = dontDistribute super."TreeT"; + "Treiber" = dontDistribute super."Treiber"; + "TrendGraph" = dontDistribute super."TrendGraph"; + "TrieMap" = dontDistribute super."TrieMap"; + "Twofish" = dontDistribute super."Twofish"; + "TypeClass" = dontDistribute super."TypeClass"; + "TypeCompose" = dontDistribute super."TypeCompose"; + "TypeIlluminator" = dontDistribute super."TypeIlluminator"; + "TypeNat" = dontDistribute super."TypeNat"; + "TypingTester" = dontDistribute super."TypingTester"; + "UISF" = dontDistribute super."UISF"; + "UMM" = dontDistribute super."UMM"; + "URLT" = dontDistribute super."URLT"; + "URLb" = dontDistribute super."URLb"; + "UTFTConverter" = dontDistribute super."UTFTConverter"; + "Unique" = dontDistribute super."Unique"; + "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; + "Updater" = dontDistribute super."Updater"; + "UrlDisp" = dontDistribute super."UrlDisp"; + "Useful" = dontDistribute super."Useful"; + "UtilityTM" = dontDistribute super."UtilityTM"; + "VKHS" = dontDistribute super."VKHS"; + "Validation" = dontDistribute super."Validation"; + "Vec" = dontDistribute super."Vec"; + "Vec-Boolean" = dontDistribute super."Vec-Boolean"; + "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; + "Vec-Transform" = dontDistribute super."Vec-Transform"; + "VecN" = dontDistribute super."VecN"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "ViennaRNAParser" = dontDistribute super."ViennaRNAParser"; + "WAVE" = dontDistribute super."WAVE"; + "WL500gPControl" = dontDistribute super."WL500gPControl"; + "WL500gPLib" = dontDistribute super."WL500gPLib"; + "WMSigner" = dontDistribute super."WMSigner"; + "WURFL" = dontDistribute super."WURFL"; + "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; + "WashNGo" = dontDistribute super."WashNGo"; + "WaveFront" = dontDistribute super."WaveFront"; + "Weather" = dontDistribute super."Weather"; + "WebBits" = dontDistribute super."WebBits"; + "WebBits-Html" = dontDistribute super."WebBits-Html"; + "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; + "WebCont" = dontDistribute super."WebCont"; + "WeberLogic" = dontDistribute super."WeberLogic"; + "Webrexp" = dontDistribute super."Webrexp"; + "Wheb" = dontDistribute super."Wheb"; + "WikimediaParser" = dontDistribute super."WikimediaParser"; + "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; + "Win32-errors" = dontDistribute super."Win32-errors"; + "Win32-extras" = dontDistribute super."Win32-extras"; + "Win32-junction-point" = dontDistribute super."Win32-junction-point"; + "Win32-security" = dontDistribute super."Win32-security"; + "Win32-services" = dontDistribute super."Win32-services"; + "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; + "Wired" = dontDistribute super."Wired"; + "WordNet" = dontDistribute super."WordNet"; + "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; + "Wordlint" = dontDistribute super."Wordlint"; + "WxGeneric" = dontDistribute super."WxGeneric"; + "X11-extras" = dontDistribute super."X11-extras"; + "X11-rm" = dontDistribute super."X11-rm"; + "X11-xdamage" = dontDistribute super."X11-xdamage"; + "X11-xfixes" = dontDistribute super."X11-xfixes"; + "X11-xft" = dontDistribute super."X11-xft"; + "X11-xshape" = dontDistribute super."X11-xshape"; + "XAttr" = dontDistribute super."XAttr"; + "XInput" = dontDistribute super."XInput"; + "XMMS" = dontDistribute super."XMMS"; + "XMPP" = dontDistribute super."XMPP"; + "XSaiga" = dontDistribute super."XSaiga"; + "Xauth" = dontDistribute super."Xauth"; + "Xec" = dontDistribute super."Xec"; + "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; + "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; + "YACPong" = dontDistribute super."YACPong"; + "YFrob" = dontDistribute super."YFrob"; + "Yablog" = dontDistribute super."Yablog"; + "YamlReference" = dontDistribute super."YamlReference"; + "Yampa-core" = dontDistribute super."Yampa-core"; + "Yocto" = dontDistribute super."Yocto"; + "Yogurt" = dontDistribute super."Yogurt"; + "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; + "ZEBEDDE" = dontDistribute super."ZEBEDDE"; + "ZFS" = dontDistribute super."ZFS"; + "ZMachine" = dontDistribute super."ZMachine"; + "ZipFold" = dontDistribute super."ZipFold"; + "ZipperAG" = dontDistribute super."ZipperAG"; + "Zora" = dontDistribute super."Zora"; + "Zwaluw" = dontDistribute super."Zwaluw"; + "a50" = dontDistribute super."a50"; + "abacate" = dontDistribute super."abacate"; + "abc-puzzle" = dontDistribute super."abc-puzzle"; + "abcBridge" = dontDistribute super."abcBridge"; + "abcnotation" = dontDistribute super."abcnotation"; + "abeson" = dontDistribute super."abeson"; + "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; + "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; + "abt" = dontDistribute super."abt"; + "ac-machine" = dontDistribute super."ac-machine"; + "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; + "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; + "accelerate-cublas" = dontDistribute super."accelerate-cublas"; + "accelerate-cuda" = dontDistribute super."accelerate-cuda"; + "accelerate-cufft" = dontDistribute super."accelerate-cufft"; + "accelerate-examples" = dontDistribute super."accelerate-examples"; + "accelerate-fft" = dontDistribute super."accelerate-fft"; + "accelerate-fftw" = dontDistribute super."accelerate-fftw"; + "accelerate-fourier" = dontDistribute super."accelerate-fourier"; + "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; + "accelerate-io" = dontDistribute super."accelerate-io"; + "accelerate-random" = dontDistribute super."accelerate-random"; + "accelerate-utility" = dontDistribute super."accelerate-utility"; + "accentuateus" = dontDistribute super."accentuateus"; + "access-time" = dontDistribute super."access-time"; + "acid-state" = doDistribute super."acid-state_0_12_4"; + "acid-state-dist" = dontDistribute super."acid-state-dist"; + "acid-state-tls" = dontDistribute super."acid-state-tls"; + "acl2" = dontDistribute super."acl2"; + "acme-all-monad" = dontDistribute super."acme-all-monad"; + "acme-box" = dontDistribute super."acme-box"; + "acme-cadre" = dontDistribute super."acme-cadre"; + "acme-cofunctor" = dontDistribute super."acme-cofunctor"; + "acme-colosson" = dontDistribute super."acme-colosson"; + "acme-comonad" = dontDistribute super."acme-comonad"; + "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-dont" = dontDistribute super."acme-dont"; + "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; + "acme-grawlix" = dontDistribute super."acme-grawlix"; + "acme-hq9plus" = dontDistribute super."acme-hq9plus"; + "acme-http" = dontDistribute super."acme-http"; + "acme-inator" = dontDistribute super."acme-inator"; + "acme-io" = dontDistribute super."acme-io"; + "acme-lolcat" = dontDistribute super."acme-lolcat"; + "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; + "acme-memorandom" = dontDistribute super."acme-memorandom"; + "acme-microwave" = dontDistribute super."acme-microwave"; + "acme-miscorder" = dontDistribute super."acme-miscorder"; + "acme-missiles" = dontDistribute super."acme-missiles"; + "acme-now" = dontDistribute super."acme-now"; + "acme-numbersystem" = dontDistribute super."acme-numbersystem"; + "acme-omitted" = dontDistribute super."acme-omitted"; + "acme-one" = dontDistribute super."acme-one"; + "acme-operators" = dontDistribute super."acme-operators"; + "acme-php" = dontDistribute super."acme-php"; + "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; + "acme-realworld" = dontDistribute super."acme-realworld"; + "acme-safe" = dontDistribute super."acme-safe"; + "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; + "acme-strfry" = dontDistribute super."acme-strfry"; + "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; + "acme-strtok" = dontDistribute super."acme-strtok"; + "acme-timemachine" = dontDistribute super."acme-timemachine"; + "acme-year" = dontDistribute super."acme-year"; + "acme-zero" = dontDistribute super."acme-zero"; + "activehs" = dontDistribute super."activehs"; + "activehs-base" = dontDistribute super."activehs-base"; + "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; + "actor" = dontDistribute super."actor"; + "ad" = doDistribute super."ad_4_2_4"; + "adaptive-containers" = dontDistribute super."adaptive-containers"; + "adaptive-tuple" = dontDistribute super."adaptive-tuple"; + "adb" = dontDistribute super."adb"; + "adblock2privoxy" = dontDistribute super."adblock2privoxy"; + "addLicenseInfo" = dontDistribute super."addLicenseInfo"; + "adhoc-network" = dontDistribute super."adhoc-network"; + "adict" = dontDistribute super."adict"; + "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; + "adp-multi" = dontDistribute super."adp-multi"; + "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson" = doDistribute super."aeson_0_8_0_2"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-lens" = dontDistribute super."aeson-lens"; + "aeson-native" = dontDistribute super."aeson-native"; + "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; + "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; + "aeson-serialize" = dontDistribute super."aeson-serialize"; + "aeson-smart" = dontDistribute super."aeson-smart"; + "aeson-streams" = dontDistribute super."aeson-streams"; + "aeson-t" = dontDistribute super."aeson-t"; + "aeson-toolkit" = dontDistribute super."aeson-toolkit"; + "aeson-value-parser" = dontDistribute super."aeson-value-parser"; + "aeson-yak" = dontDistribute super."aeson-yak"; + "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; + "afis" = dontDistribute super."afis"; + "afv" = dontDistribute super."afv"; + "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; + "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll"; + "agum" = dontDistribute super."agum"; + "aig" = dontDistribute super."aig"; + "air" = dontDistribute super."air"; + "air-extra" = dontDistribute super."air-extra"; + "air-spec" = dontDistribute super."air-spec"; + "air-th" = dontDistribute super."air-th"; + "airbrake" = dontDistribute super."airbrake"; + "airship" = dontDistribute super."airship"; + "aivika" = dontDistribute super."aivika"; + "aivika-experiment" = dontDistribute super."aivika-experiment"; + "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; + "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; + "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; + "aivika-transformers" = dontDistribute super."aivika-transformers"; + "ajhc" = dontDistribute super."ajhc"; + "al" = dontDistribute super."al"; + "alea" = dontDistribute super."alea"; + "alex-meta" = dontDistribute super."alex-meta"; + "alfred" = dontDistribute super."alfred"; + "alga" = dontDistribute super."alga"; + "algebra" = dontDistribute super."algebra"; + "algebra-dag" = dontDistribute super."algebra-dag"; + "algebra-sql" = dontDistribute super."algebra-sql"; + "algebraic" = dontDistribute super."algebraic"; + "algebraic-classes" = dontDistribute super."algebraic-classes"; + "align" = dontDistribute super."align"; + "align-text" = dontDistribute super."align-text"; + "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; + "allocated-processor" = dontDistribute super."allocated-processor"; + "alloy" = dontDistribute super."alloy"; + "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; + "almost-fix" = dontDistribute super."almost-fix"; + "alms" = dontDistribute super."alms"; + "alpha" = dontDistribute super."alpha"; + "alpino-tools" = dontDistribute super."alpino-tools"; + "alsa" = dontDistribute super."alsa"; + "alsa-core" = dontDistribute super."alsa-core"; + "alsa-gui" = dontDistribute super."alsa-gui"; + "alsa-midi" = dontDistribute super."alsa-midi"; + "alsa-mixer" = dontDistribute super."alsa-mixer"; + "alsa-pcm" = dontDistribute super."alsa-pcm"; + "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; + "alsa-seq" = dontDistribute super."alsa-seq"; + "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; + "altcomposition" = dontDistribute super."altcomposition"; + "alternative-io" = dontDistribute super."alternative-io"; + "altfloat" = dontDistribute super."altfloat"; + "alure" = dontDistribute super."alure"; + "amazon-emailer" = dontDistribute super."amazon-emailer"; + "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; + "amazon-products" = dontDistribute super."amazon-products"; + "amazonka" = doDistribute super."amazonka_0_3_6"; + "amazonka-apigateway" = dontDistribute super."amazonka-apigateway"; + "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6"; + "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6"; + "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6"; + "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6"; + "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6"; + "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6"; + "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6"; + "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6"; + "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6"; + "amazonka-codecommit" = dontDistribute super."amazonka-codecommit"; + "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6"; + "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline"; + "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6"; + "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6"; + "amazonka-config" = doDistribute super."amazonka-config_0_3_6"; + "amazonka-core" = doDistribute super."amazonka-core_0_3_6"; + "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6"; + "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm"; + "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6"; + "amazonka-ds" = dontDistribute super."amazonka-ds"; + "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6"; + "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams"; + "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1"; + "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6"; + "amazonka-efs" = dontDistribute super."amazonka-efs"; + "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6"; + "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6"; + "amazonka-elasticsearch" = dontDistribute super."amazonka-elasticsearch"; + "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6"; + "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6"; + "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6"; + "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6"; + "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6"; + "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6"; + "amazonka-inspector" = dontDistribute super."amazonka-inspector"; + "amazonka-iot" = dontDistribute super."amazonka-iot"; + "amazonka-iot-dataplane" = dontDistribute super."amazonka-iot-dataplane"; + "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6"; + "amazonka-kinesis-firehose" = dontDistribute super."amazonka-kinesis-firehose"; + "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6"; + "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6"; + "amazonka-marketplace-analytics" = dontDistribute super."amazonka-marketplace-analytics"; + "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6"; + "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6"; + "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6"; + "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6"; + "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1"; + "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6"; + "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6"; + "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6"; + "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6"; + "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6"; + "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6"; + "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6"; + "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6"; + "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6"; + "amazonka-support" = doDistribute super."amazonka-support_0_3_6"; + "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6"; + "amazonka-test" = dontDistribute super."amazonka-test"; + "amazonka-waf" = dontDistribute super."amazonka-waf"; + "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6"; + "ampersand" = dontDistribute super."ampersand"; + "amqp-conduit" = dontDistribute super."amqp-conduit"; + "amrun" = dontDistribute super."amrun"; + "analyze-client" = dontDistribute super."analyze-client"; + "anansi" = dontDistribute super."anansi"; + "anansi-hscolour" = dontDistribute super."anansi-hscolour"; + "anansi-pandoc" = dontDistribute super."anansi-pandoc"; + "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; + "android-lint-summary" = dontDistribute super."android-lint-summary"; + "animalcase" = dontDistribute super."animalcase"; + "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; + "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; + "ansi-pretty" = dontDistribute super."ansi-pretty"; + "ansigraph" = dontDistribute super."ansigraph"; + "antagonist" = dontDistribute super."antagonist"; + "antfarm" = dontDistribute super."antfarm"; + "anticiv" = dontDistribute super."anticiv"; + "antigate" = dontDistribute super."antigate"; + "antimirov" = dontDistribute super."antimirov"; + "antiquoter" = dontDistribute super."antiquoter"; + "antisplice" = dontDistribute super."antisplice"; + "antlrc" = dontDistribute super."antlrc"; + "anydbm" = dontDistribute super."anydbm"; + "aosd" = dontDistribute super."aosd"; + "ap-reflect" = dontDistribute super."ap-reflect"; + "apache-md5" = dontDistribute super."apache-md5"; + "apelsin" = dontDistribute super."apelsin"; + "api-builder" = dontDistribute super."api-builder"; + "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; + "api-tools" = dontDistribute super."api-tools"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "app-settings" = dontDistribute super."app-settings"; + "appc" = dontDistribute super."appc"; + "applicative-extras" = dontDistribute super."applicative-extras"; + "applicative-fail" = dontDistribute super."applicative-fail"; + "applicative-numbers" = dontDistribute super."applicative-numbers"; + "applicative-parsec" = dontDistribute super."applicative-parsec"; + "apply-refact" = dontDistribute super."apply-refact"; + "apportionment" = dontDistribute super."apportionment"; + "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate-equality" = dontDistribute super."approximate-equality"; + "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; + "arb-fft" = dontDistribute super."arb-fft"; + "arbb-vm" = dontDistribute super."arbb-vm"; + "archive" = dontDistribute super."archive"; + "archiver" = dontDistribute super."archiver"; + "archlinux" = dontDistribute super."archlinux"; + "archlinux-web" = dontDistribute super."archlinux-web"; + "archnews" = dontDistribute super."archnews"; + "arff" = dontDistribute super."arff"; + "argon" = dontDistribute super."argon"; + "argparser" = dontDistribute super."argparser"; + "arguedit" = dontDistribute super."arguedit"; + "ariadne" = dontDistribute super."ariadne"; + "arion" = dontDistribute super."arion"; + "arith-encode" = dontDistribute super."arith-encode"; + "arithmatic" = dontDistribute super."arithmatic"; + "arithmetic" = dontDistribute super."arithmetic"; + "arithmoi" = dontDistribute super."arithmoi"; + "armada" = dontDistribute super."armada"; + "arpa" = dontDistribute super."arpa"; + "array-forth" = dontDistribute super."array-forth"; + "array-memoize" = dontDistribute super."array-memoize"; + "array-primops" = dontDistribute super."array-primops"; + "array-utils" = dontDistribute super."array-utils"; + "arrow-improve" = dontDistribute super."arrow-improve"; + "arrowapply-utils" = dontDistribute super."arrowapply-utils"; + "arrowp" = dontDistribute super."arrowp"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-progress" = dontDistribute super."ascii-progress"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1dump" = dontDistribute super."asn1dump"; + "assembler" = dontDistribute super."assembler"; + "assert" = dontDistribute super."assert"; + "assert-failure" = dontDistribute super."assert-failure"; + "assertions" = dontDistribute super."assertions"; + "assimp" = dontDistribute super."assimp"; + "astar" = dontDistribute super."astar"; + "astrds" = dontDistribute super."astrds"; + "astview" = dontDistribute super."astview"; + "astview-utils" = dontDistribute super."astview-utils"; + "async-extras" = dontDistribute super."async-extras"; + "async-manager" = dontDistribute super."async-manager"; + "async-pool" = dontDistribute super."async-pool"; + "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; + "aterm" = dontDistribute super."aterm"; + "aterm-utils" = dontDistribute super."aterm-utils"; + "atl" = dontDistribute super."atl"; + "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; + "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; + "atmos" = dontDistribute super."atmos"; + "atmos-dimensional" = dontDistribute super."atmos-dimensional"; + "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; + "atom" = dontDistribute super."atom"; + "atom-basic" = dontDistribute super."atom-basic"; + "atom-conduit" = dontDistribute super."atom-conduit"; + "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; + "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; + "atomic-write" = dontDistribute super."atomic-write"; + "atomo" = dontDistribute super."atomo"; + "atp-haskell" = dontDistribute super."atp-haskell"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; + "attoparsec-arff" = dontDistribute super."attoparsec-arff"; + "attoparsec-binary" = dontDistribute super."attoparsec-binary"; + "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; + "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; + "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; + "attoparsec-text" = dontDistribute super."attoparsec-text"; + "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attosplit" = dontDistribute super."attosplit"; + "atuin" = dontDistribute super."atuin"; + "audacity" = dontDistribute super."audacity"; + "audiovisual" = dontDistribute super."audiovisual"; + "augeas" = dontDistribute super."augeas"; + "augur" = dontDistribute super."augur"; + "aur" = dontDistribute super."aur"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autonix-deps" = dontDistribute super."autonix-deps"; + "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; + "autoproc" = dontDistribute super."autoproc"; + "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; + "average" = dontDistribute super."average"; + "avers" = dontDistribute super."avers"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; + "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; + "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; + "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; + "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; + "aws-ec2" = dontDistribute super."aws-ec2"; + "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; + "aws-general" = dontDistribute super."aws-general"; + "aws-kinesis" = dontDistribute super."aws-kinesis"; + "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; + "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; + "aws-lambda" = dontDistribute super."aws-lambda"; + "aws-performance-tests" = dontDistribute super."aws-performance-tests"; + "aws-route53" = dontDistribute super."aws-route53"; + "aws-sdk" = dontDistribute super."aws-sdk"; + "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; + "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; + "aws-sign4" = dontDistribute super."aws-sign4"; + "aws-sns" = dontDistribute super."aws-sns"; + "azure-acs" = dontDistribute super."azure-acs"; + "azure-service-api" = dontDistribute super."azure-service-api"; + "azure-servicebus" = dontDistribute super."azure-servicebus"; + "azurify" = dontDistribute super."azurify"; + "b-tree" = dontDistribute super."b-tree"; + "babylon" = dontDistribute super."babylon"; + "backdropper" = dontDistribute super."backdropper"; + "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; + "backward-state" = dontDistribute super."backward-state"; + "bacteria" = dontDistribute super."bacteria"; + "bag" = dontDistribute super."bag"; + "bamboo" = dontDistribute super."bamboo"; + "bamboo-launcher" = dontDistribute super."bamboo-launcher"; + "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; + "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; + "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; + "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; + "bamse" = dontDistribute super."bamse"; + "bamstats" = dontDistribute super."bamstats"; + "bank-holiday-usa" = dontDistribute super."bank-holiday-usa"; + "banwords" = dontDistribute super."banwords"; + "barchart" = dontDistribute super."barchart"; + "barcodes-code128" = dontDistribute super."barcodes-code128"; + "barecheck" = dontDistribute super."barecheck"; + "barley" = dontDistribute super."barley"; + "barrie" = dontDistribute super."barrie"; + "barrier" = dontDistribute super."barrier"; + "barrier-monad" = dontDistribute super."barrier-monad"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-noprelude" = dontDistribute super."base-noprelude"; + "base32-bytestring" = dontDistribute super."base32-bytestring"; + "base58-bytestring" = dontDistribute super."base58-bytestring"; + "base58address" = dontDistribute super."base58address"; + "base64-conduit" = dontDistribute super."base64-conduit"; + "base91" = dontDistribute super."base91"; + "basex-client" = dontDistribute super."basex-client"; + "bash" = dontDistribute super."bash"; + "basic-lens" = dontDistribute super."basic-lens"; + "basic-sop" = dontDistribute super."basic-sop"; + "baskell" = dontDistribute super."baskell"; + "battlenet" = dontDistribute super."battlenet"; + "battlenet-yesod" = dontDistribute super."battlenet-yesod"; + "battleships" = dontDistribute super."battleships"; + "bayes-stack" = dontDistribute super."bayes-stack"; + "bbdb" = dontDistribute super."bbdb"; + "bcrypt" = doDistribute super."bcrypt_0_0_6"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "benchpress" = dontDistribute super."benchpress"; + "bencoding" = dontDistribute super."bencoding"; + "berkeleydb" = dontDistribute super."berkeleydb"; + "berp" = dontDistribute super."berp"; + "bert" = dontDistribute super."bert"; + "besout" = dontDistribute super."besout"; + "bet" = dontDistribute super."bet"; + "betacode" = dontDistribute super."betacode"; + "between" = dontDistribute super."between"; + "bf-cata" = dontDistribute super."bf-cata"; + "bff" = dontDistribute super."bff"; + "bff-mono" = dontDistribute super."bff-mono"; + "bgmax" = dontDistribute super."bgmax"; + "bgzf" = dontDistribute super."bgzf"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "billboard-parser" = dontDistribute super."billboard-parser"; + "billeksah-forms" = dontDistribute super."billeksah-forms"; + "billeksah-main" = dontDistribute super."billeksah-main"; + "billeksah-main-static" = dontDistribute super."billeksah-main-static"; + "billeksah-pane" = dontDistribute super."billeksah-pane"; + "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = dontDistribute super."bimap"; + "bimap-server" = dontDistribute super."bimap-server"; + "bimaps" = dontDistribute super."bimaps"; + "binary-bits" = dontDistribute super."binary-bits"; + "binary-communicator" = dontDistribute super."binary-communicator"; + "binary-derive" = dontDistribute super."binary-derive"; + "binary-enum" = dontDistribute super."binary-enum"; + "binary-file" = dontDistribute super."binary-file"; + "binary-generic" = dontDistribute super."binary-generic"; + "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; + "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; + "binary-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; + "binary-state" = dontDistribute super."binary-state"; + "binary-store" = dontDistribute super."binary-store"; + "binary-streams" = dontDistribute super."binary-streams"; + "binary-strict" = dontDistribute super."binary-strict"; + "binary-typed" = dontDistribute super."binary-typed"; + "binarydefer" = dontDistribute super."binarydefer"; + "bind-marshal" = dontDistribute super."bind-marshal"; + "binding-core" = dontDistribute super."binding-core"; + "binding-gtk" = dontDistribute super."binding-gtk"; + "binding-wx" = dontDistribute super."binding-wx"; + "bindings" = dontDistribute super."bindings"; + "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = dontDistribute super."bindings-GLFW"; + "bindings-K8055" = dontDistribute super."bindings-K8055"; + "bindings-apr" = dontDistribute super."bindings-apr"; + "bindings-apr-util" = dontDistribute super."bindings-apr-util"; + "bindings-audiofile" = dontDistribute super."bindings-audiofile"; + "bindings-bfd" = dontDistribute super."bindings-bfd"; + "bindings-cctools" = dontDistribute super."bindings-cctools"; + "bindings-codec2" = dontDistribute super."bindings-codec2"; + "bindings-common" = dontDistribute super."bindings-common"; + "bindings-dc1394" = dontDistribute super."bindings-dc1394"; + "bindings-directfb" = dontDistribute super."bindings-directfb"; + "bindings-eskit" = dontDistribute super."bindings-eskit"; + "bindings-fann" = dontDistribute super."bindings-fann"; + "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; + "bindings-friso" = dontDistribute super."bindings-friso"; + "bindings-glib" = dontDistribute super."bindings-glib"; + "bindings-gobject" = dontDistribute super."bindings-gobject"; + "bindings-gpgme" = dontDistribute super."bindings-gpgme"; + "bindings-gsl" = dontDistribute super."bindings-gsl"; + "bindings-gts" = dontDistribute super."bindings-gts"; + "bindings-hamlib" = dontDistribute super."bindings-hamlib"; + "bindings-hdf5" = dontDistribute super."bindings-hdf5"; + "bindings-levmar" = dontDistribute super."bindings-levmar"; + "bindings-libcddb" = dontDistribute super."bindings-libcddb"; + "bindings-libffi" = dontDistribute super."bindings-libffi"; + "bindings-libftdi" = dontDistribute super."bindings-libftdi"; + "bindings-librrd" = dontDistribute super."bindings-librrd"; + "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; + "bindings-libusb" = dontDistribute super."bindings-libusb"; + "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; + "bindings-libzip" = dontDistribute super."bindings-libzip"; + "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; + "bindings-lxc" = dontDistribute super."bindings-lxc"; + "bindings-mmap" = dontDistribute super."bindings-mmap"; + "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; + "bindings-nettle" = dontDistribute super."bindings-nettle"; + "bindings-parport" = dontDistribute super."bindings-parport"; + "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-posix" = dontDistribute super."bindings-posix"; + "bindings-potrace" = dontDistribute super."bindings-potrace"; + "bindings-ppdev" = dontDistribute super."bindings-ppdev"; + "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; + "bindings-sane" = dontDistribute super."bindings-sane"; + "bindings-sc3" = dontDistribute super."bindings-sc3"; + "bindings-sipc" = dontDistribute super."bindings-sipc"; + "bindings-sophia" = dontDistribute super."bindings-sophia"; + "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; + "bindings-svm" = dontDistribute super."bindings-svm"; + "bindings-uname" = dontDistribute super."bindings-uname"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "bindynamic" = dontDistribute super."bindynamic"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bio" = dontDistribute super."bio"; + "biophd" = dontDistribute super."biophd"; + "biosff" = dontDistribute super."biosff"; + "biostockholm" = dontDistribute super."biostockholm"; + "bird" = dontDistribute super."bird"; + "bit-array" = dontDistribute super."bit-array"; + "bit-vector" = dontDistribute super."bit-vector"; + "bitarray" = dontDistribute super."bitarray"; + "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; + "bitly-cli" = dontDistribute super."bitly-cli"; + "bitmap" = dontDistribute super."bitmap"; + "bitmap-opengl" = dontDistribute super."bitmap-opengl"; + "bitmaps" = dontDistribute super."bitmaps"; + "bits-atomic" = dontDistribute super."bits-atomic"; + "bits-conduit" = dontDistribute super."bits-conduit"; + "bits-extras" = dontDistribute super."bits-extras"; + "bitset" = dontDistribute super."bitset"; + "bitspeak" = dontDistribute super."bitspeak"; + "bitstream" = dontDistribute super."bitstream"; + "bitstring" = dontDistribute super."bitstring"; + "bittorrent" = dontDistribute super."bittorrent"; + "bitvec" = dontDistribute super."bitvec"; + "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bk-tree" = dontDistribute super."bk-tree"; + "bkr" = dontDistribute super."bkr"; + "bktrees" = dontDistribute super."bktrees"; + "bla" = dontDistribute super."bla"; + "black-jewel" = dontDistribute super."black-jewel"; + "blacktip" = dontDistribute super."blacktip"; + "blake2" = dontDistribute super."blake2"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = dontDistribute super."blank-canvas"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blaze" = dontDistribute super."blaze"; + "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; + "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; + "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; + "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; + "blaze-json" = dontDistribute super."blaze-json"; + "blaze-shields" = dontDistribute super."blaze-shields"; + "blaze-textual-native" = dontDistribute super."blaze-textual-native"; + "blazeMarker" = dontDistribute super."blazeMarker"; + "blink1" = dontDistribute super."blink1"; + "blip" = dontDistribute super."blip"; + "bliplib" = dontDistribute super."bliplib"; + "blocking-transactions" = dontDistribute super."blocking-transactions"; + "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "boolean-list" = dontDistribute super."boolean-list"; + "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; + "boolexpr" = dontDistribute super."boolexpr"; + "bools" = dontDistribute super."bools"; + "boolsimplifier" = dontDistribute super."boolsimplifier"; + "boomange" = dontDistribute super."boomange"; + "boomerang" = dontDistribute super."boomerang"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "both" = dontDistribute super."both"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bpann" = dontDistribute super."bpann"; + "brainfuck-monad" = dontDistribute super."brainfuck-monad"; + "brainfuck-tut" = dontDistribute super."brainfuck-tut"; + "break" = dontDistribute super."break"; + "breakout" = dontDistribute super."breakout"; + "breve" = dontDistribute super."breve"; + "brians-brain" = dontDistribute super."brians-brain"; + "brick" = dontDistribute super."brick"; + "brillig" = dontDistribute super."brillig"; + "broccoli" = dontDistribute super."broccoli"; + "broker-haskell" = dontDistribute super."broker-haskell"; + "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson-generic" = dontDistribute super."bson-generic"; + "bson-generics" = dontDistribute super."bson-generics"; + "bson-lens" = dontDistribute super."bson-lens"; + "bson-mapping" = dontDistribute super."bson-mapping"; + "bspack" = dontDistribute super."bspack"; + "bsparse" = dontDistribute super."bsparse"; + "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; + "buffon" = dontDistribute super."buffon"; + "bugzilla" = dontDistribute super."bugzilla"; + "buildable" = dontDistribute super."buildable"; + "buildbox" = dontDistribute super."buildbox"; + "buildbox-tools" = dontDistribute super."buildbox-tools"; + "buildwrapper" = dontDistribute super."buildwrapper"; + "bullet" = dontDistribute super."bullet"; + "burst-detection" = dontDistribute super."burst-detection"; + "bus-pirate" = dontDistribute super."bus-pirate"; + "buster" = dontDistribute super."buster"; + "buster-gtk" = dontDistribute super."buster-gtk"; + "buster-network" = dontDistribute super."buster-network"; + "bustle" = dontDistribute super."bustle"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "byteset" = dontDistribute super."byteset"; + "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; + "bytestring-class" = dontDistribute super."bytestring-class"; + "bytestring-csv" = dontDistribute super."bytestring-csv"; + "bytestring-delta" = dontDistribute super."bytestring-delta"; + "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-nums" = dontDistribute super."bytestring-nums"; + "bytestring-plain" = dontDistribute super."bytestring-plain"; + "bytestring-rematch" = dontDistribute super."bytestring-rematch"; + "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestringparser" = dontDistribute super."bytestringparser"; + "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; + "bytestringreadp" = dontDistribute super."bytestringreadp"; + "c-dsl" = dontDistribute super."c-dsl"; + "c-io" = dontDistribute super."c-io"; + "c-storable-deriving" = dontDistribute super."c-storable-deriving"; + "c0check" = dontDistribute super."c0check"; + "c0parser" = dontDistribute super."c0parser"; + "c10k" = dontDistribute super."c10k"; + "c2hs" = doDistribute super."c2hs_0_25_2"; + "c2hsc" = dontDistribute super."c2hsc"; + "cab" = dontDistribute super."cab"; + "cabal-audit" = dontDistribute super."cabal-audit"; + "cabal-bounds" = dontDistribute super."cabal-bounds"; + "cabal-cargs" = dontDistribute super."cabal-cargs"; + "cabal-constraints" = dontDistribute super."cabal-constraints"; + "cabal-db" = dontDistribute super."cabal-db"; + "cabal-debian" = doDistribute super."cabal-debian_4_30_2"; + "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; + "cabal-dev" = dontDistribute super."cabal-dev"; + "cabal-dir" = dontDistribute super."cabal-dir"; + "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; + "cabal-ghci" = dontDistribute super."cabal-ghci"; + "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; + "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; + "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; + "cabal-lenses" = dontDistribute super."cabal-lenses"; + "cabal-macosx" = dontDistribute super."cabal-macosx"; + "cabal-meta" = dontDistribute super."cabal-meta"; + "cabal-mon" = dontDistribute super."cabal-mon"; + "cabal-nirvana" = dontDistribute super."cabal-nirvana"; + "cabal-progdeps" = dontDistribute super."cabal-progdeps"; + "cabal-query" = dontDistribute super."cabal-query"; + "cabal-scripts" = dontDistribute super."cabal-scripts"; + "cabal-setup" = dontDistribute super."cabal-setup"; + "cabal-sign" = dontDistribute super."cabal-sign"; + "cabal-sort" = dontDistribute super."cabal-sort"; + "cabal-test" = dontDistribute super."cabal-test"; + "cabal-test-bin" = dontDistribute super."cabal-test-bin"; + "cabal-test-compat" = dontDistribute super."cabal-test-compat"; + "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; + "cabal-uninstall" = dontDistribute super."cabal-uninstall"; + "cabal-upload" = dontDistribute super."cabal-upload"; + "cabal2arch" = dontDistribute super."cabal2arch"; + "cabal2doap" = dontDistribute super."cabal2doap"; + "cabal2ebuild" = dontDistribute super."cabal2ebuild"; + "cabal2ghci" = dontDistribute super."cabal2ghci"; + "cabal2nix" = dontDistribute super."cabal2nix"; + "cabal2spec" = dontDistribute super."cabal2spec"; + "cabalQuery" = dontDistribute super."cabalQuery"; + "cabalg" = dontDistribute super."cabalg"; + "cabalgraph" = dontDistribute super."cabalgraph"; + "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; + "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; + "cabalvchk" = dontDistribute super."cabalvchk"; + "cabin" = dontDistribute super."cabin"; + "cabocha" = dontDistribute super."cabocha"; + "cached-io" = dontDistribute super."cached-io"; + "cached-traversable" = dontDistribute super."cached-traversable"; + "cacophony" = dontDistribute super."cacophony"; + "caf" = dontDistribute super."caf"; + "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; + "caffegraph" = dontDistribute super."caffegraph"; + "cairo-appbase" = dontDistribute super."cairo-appbase"; + "cake" = dontDistribute super."cake"; + "cake3" = dontDistribute super."cake3"; + "cakyrespa" = dontDistribute super."cakyrespa"; + "cal3d" = dontDistribute super."cal3d"; + "cal3d-examples" = dontDistribute super."cal3d-examples"; + "cal3d-opengl" = dontDistribute super."cal3d-opengl"; + "calc" = dontDistribute super."calc"; + "calculator" = dontDistribute super."calculator"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-log" = dontDistribute super."canteven-log"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "car-pool" = dontDistribute super."car-pool"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "carray" = dontDistribute super."carray"; + "casadi-bindings" = dontDistribute super."casadi-bindings"; + "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; + "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; + "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; + "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; + "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; + "cascading" = dontDistribute super."cascading"; + "case-conversion" = dontDistribute super."case-conversion"; + "cased" = dontDistribute super."cased"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava-conduit" = dontDistribute super."cassava-conduit"; + "cassava-streams" = dontDistribute super."cassava-streams"; + "cassette" = dontDistribute super."cassette"; + "cassy" = dontDistribute super."cassy"; + "castle" = dontDistribute super."castle"; + "casui" = dontDistribute super."casui"; + "catamorphism" = dontDistribute super."catamorphism"; + "catch-fd" = dontDistribute super."catch-fd"; + "categorical-algebra" = dontDistribute super."categorical-algebra"; + "categories" = dontDistribute super."categories"; + "category-extras" = dontDistribute super."category-extras"; + "cayley-dickson" = dontDistribute super."cayley-dickson"; + "cblrepo" = dontDistribute super."cblrepo"; + "cci" = dontDistribute super."cci"; + "ccnx" = dontDistribute super."ccnx"; + "cctools-workqueue" = dontDistribute super."cctools-workqueue"; + "cedict" = dontDistribute super."cedict"; + "cef" = dontDistribute super."cef"; + "ceilometer-common" = dontDistribute super."ceilometer-common"; + "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-derive" = dontDistribute super."cereal-derive"; + "cereal-enumerator" = dontDistribute super."cereal-enumerator"; + "cereal-ieee754" = dontDistribute super."cereal-ieee754"; + "cereal-plus" = dontDistribute super."cereal-plus"; + "cereal-text" = dontDistribute super."cereal-text"; + "certificate" = dontDistribute super."certificate"; + "cf" = dontDistribute super."cf"; + "cfipu" = dontDistribute super."cfipu"; + "cflp" = dontDistribute super."cflp"; + "cfopu" = dontDistribute super."cfopu"; + "cg" = dontDistribute super."cg"; + "cgen" = dontDistribute super."cgen"; + "cgi-undecidable" = dontDistribute super."cgi-undecidable"; + "cgi-utils" = dontDistribute super."cgi-utils"; + "cgrep" = dontDistribute super."cgrep"; + "chain-codes" = dontDistribute super."chain-codes"; + "chalk" = dontDistribute super."chalk"; + "chalkboard" = dontDistribute super."chalkboard"; + "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; + "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; + "chan-split" = dontDistribute super."chan-split"; + "change-monger" = dontDistribute super."change-monger"; + "charade" = dontDistribute super."charade"; + "charsetdetect" = dontDistribute super."charsetdetect"; + "charsetdetect-ae" = dontDistribute super."charsetdetect-ae"; + "chart-histogram" = dontDistribute super."chart-histogram"; + "chaselev-deque" = dontDistribute super."chaselev-deque"; + "chatter" = dontDistribute super."chatter"; + "chatty" = dontDistribute super."chatty"; + "chatty-text" = dontDistribute super."chatty-text"; + "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate" = dontDistribute super."cheapskate"; + "check-pvp" = dontDistribute super."check-pvp"; + "checked" = dontDistribute super."checked"; + "chell-hunit" = dontDistribute super."chell-hunit"; + "chesshs" = dontDistribute super."chesshs"; + "chevalier-common" = dontDistribute super."chevalier-common"; + "chp" = dontDistribute super."chp"; + "chp-mtl" = dontDistribute super."chp-mtl"; + "chp-plus" = dontDistribute super."chp-plus"; + "chp-spec" = dontDistribute super."chp-spec"; + "chp-transformers" = dontDistribute super."chp-transformers"; + "chronograph" = dontDistribute super."chronograph"; + "chu2" = dontDistribute super."chu2"; + "chuchu" = dontDistribute super."chuchu"; + "chunks" = dontDistribute super."chunks"; + "chunky" = dontDistribute super."chunky"; + "church-list" = dontDistribute super."church-list"; + "cil" = dontDistribute super."cil"; + "cinvoke" = dontDistribute super."cinvoke"; + "cio" = dontDistribute super."cio"; + "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; + "circ" = dontDistribute super."circ"; + "cirru-parser" = dontDistribute super."cirru-parser"; + "citation-resolve" = dontDistribute super."citation-resolve"; + "citeproc-hs" = dontDistribute super."citeproc-hs"; + "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; + "cityhash" = dontDistribute super."cityhash"; + "cjk" = dontDistribute super."cjk"; + "clac" = dontDistribute super."clac"; + "clafer" = dontDistribute super."clafer"; + "claferIG" = dontDistribute super."claferIG"; + "claferwiki" = dontDistribute super."claferwiki"; + "clang-pure" = dontDistribute super."clang-pure"; + "clanki" = dontDistribute super."clanki"; + "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_5_15"; + "clash-lib" = doDistribute super."clash-lib_0_5_13"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_3"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_10"; + "clash-verilog" = doDistribute super."clash-verilog_0_5_10"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "clckwrks" = dontDistribute super."clckwrks"; + "clckwrks-cli" = dontDistribute super."clckwrks-cli"; + "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; + "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; + "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; + "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media"; + "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page"; + "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap"; + "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; + "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; + "cld2" = dontDistribute super."cld2"; + "clean-home" = dontDistribute super."clean-home"; + "clean-unions" = dontDistribute super."clean-unions"; + "cless" = dontDistribute super."cless"; + "clevercss" = dontDistribute super."clevercss"; + "cli" = dontDistribute super."cli"; + "click-clack" = dontDistribute super."click-clack"; + "clifford" = dontDistribute super."clifford"; + "clippard" = dontDistribute super."clippard"; + "clipper" = dontDistribute super."clipper"; + "clippings" = dontDistribute super."clippings"; + "clist" = dontDistribute super."clist"; + "clocked" = dontDistribute super."clocked"; + "clogparse" = dontDistribute super."clogparse"; + "clone-all" = dontDistribute super."clone-all"; + "closure" = dontDistribute super."closure"; + "cloud-haskell" = dontDistribute super."cloud-haskell"; + "cloudfront-signer" = dontDistribute super."cloudfront-signer"; + "cloudyfs" = dontDistribute super."cloudyfs"; + "cltw" = dontDistribute super."cltw"; + "clua" = dontDistribute super."clua"; + "cluss" = dontDistribute super."cluss"; + "clustertools" = dontDistribute super."clustertools"; + "clutterhs" = dontDistribute super."clutterhs"; + "cmaes" = dontDistribute super."cmaes"; + "cmath" = dontDistribute super."cmath"; + "cmathml3" = dontDistribute super."cmathml3"; + "cmd-item" = dontDistribute super."cmd-item"; + "cmdargs-browser" = dontDistribute super."cmdargs-browser"; + "cmdlib" = dontDistribute super."cmdlib"; + "cmdtheline" = dontDistribute super."cmdtheline"; + "cml" = dontDistribute super."cml"; + "cmonad" = dontDistribute super."cmonad"; + "cmu" = dontDistribute super."cmu"; + "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; + "cndict" = dontDistribute super."cndict"; + "codec" = dontDistribute super."codec"; + "codec-libevent" = dontDistribute super."codec-libevent"; + "codec-mbox" = dontDistribute super."codec-mbox"; + "codecov-haskell" = dontDistribute super."codecov-haskell"; + "codemonitor" = dontDistribute super."codemonitor"; + "codepad" = dontDistribute super."codepad"; + "codex" = doDistribute super."codex_0_3_0_10"; + "codo-notation" = dontDistribute super."codo-notation"; + "cofunctor" = dontDistribute super."cofunctor"; + "cognimeta-utils" = dontDistribute super."cognimeta-utils"; + "coinbase-exchange" = dontDistribute super."coinbase-exchange"; + "colada" = dontDistribute super."colada"; + "colchis" = dontDistribute super."colchis"; + "collada-output" = dontDistribute super."collada-output"; + "collada-types" = dontDistribute super."collada-types"; + "collapse-util" = dontDistribute super."collapse-util"; + "collection-json" = dontDistribute super."collection-json"; + "collections" = dontDistribute super."collections"; + "collections-api" = dontDistribute super."collections-api"; + "collections-base-instances" = dontDistribute super."collections-base-instances"; + "colock" = dontDistribute super."colock"; + "colorize-haskell" = dontDistribute super."colorize-haskell"; + "colors" = dontDistribute super."colors"; + "coltrane" = dontDistribute super."coltrane"; + "com" = dontDistribute super."com"; + "combinat" = dontDistribute super."combinat"; + "combinat-diagrams" = dontDistribute super."combinat-diagrams"; + "combinator-interactive" = dontDistribute super."combinator-interactive"; + "combinatorial-problems" = dontDistribute super."combinatorial-problems"; + "combinatorics" = dontDistribute super."combinatorics"; + "combobuffer" = dontDistribute super."combobuffer"; + "comfort-graph" = dontDistribute super."comfort-graph"; + "command" = dontDistribute super."command"; + "command-qq" = dontDistribute super."command-qq"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "commutative" = dontDistribute super."commutative"; + "comonad-extras" = dontDistribute super."comonad-extras"; + "comonad-random" = dontDistribute super."comonad-random"; + "compact-map" = dontDistribute super."compact-map"; + "compact-socket" = dontDistribute super."compact-socket"; + "compact-string" = dontDistribute super."compact-string"; + "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; + "compare-type" = dontDistribute super."compare-type"; + "compdata-automata" = dontDistribute super."compdata-automata"; + "compdata-dags" = dontDistribute super."compdata-dags"; + "compdata-param" = dontDistribute super."compdata-param"; + "compensated" = dontDistribute super."compensated"; + "competition" = dontDistribute super."competition"; + "compilation" = dontDistribute super."compilation"; + "complex-generic" = dontDistribute super."complex-generic"; + "complex-integrate" = dontDistribute super."complex-integrate"; + "complexity" = dontDistribute super."complexity"; + "compose-ltr" = dontDistribute super."compose-ltr"; + "compose-trans" = dontDistribute super."compose-trans"; + "composition-extra" = doDistribute super."composition-extra_1_1_0"; + "composition-tree" = dontDistribute super."composition-tree"; + "compression" = dontDistribute super."compression"; + "compstrat" = dontDistribute super."compstrat"; + "comptrans" = dontDistribute super."comptrans"; + "computational-algebra" = dontDistribute super."computational-algebra"; + "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; + "concorde" = dontDistribute super."concorde"; + "concraft" = dontDistribute super."concraft"; + "concraft-hr" = dontDistribute super."concraft-hr"; + "concraft-pl" = dontDistribute super."concraft-pl"; + "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; + "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrent-barrier" = dontDistribute super."concurrent-barrier"; + "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-output" = dontDistribute super."concurrent-output"; + "concurrent-sa" = dontDistribute super."concurrent-sa"; + "concurrent-split" = dontDistribute super."concurrent-split"; + "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-utilities" = dontDistribute super."concurrent-utilities"; + "concurrentoutput" = dontDistribute super."concurrentoutput"; + "condor" = dontDistribute super."condor"; + "condorcet" = dontDistribute super."condorcet"; + "conductive-base" = dontDistribute super."conductive-base"; + "conductive-clock" = dontDistribute super."conductive-clock"; + "conductive-hsc3" = dontDistribute super."conductive-hsc3"; + "conductive-song" = dontDistribute super."conductive-song"; + "conduit-audio" = dontDistribute super."conduit-audio"; + "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; + "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; + "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-parse" = dontDistribute super."conduit-parse"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conf" = dontDistribute super."conf"; + "config-select" = dontDistribute super."config-select"; + "config-value" = dontDistribute super."config-value"; + "configifier" = dontDistribute super."configifier"; + "configuration" = dontDistribute super."configuration"; + "configuration-tools" = dontDistribute super."configuration-tools"; + "confsolve" = dontDistribute super."confsolve"; + "congruence-relation" = dontDistribute super."congruence-relation"; + "conjugateGradient" = dontDistribute super."conjugateGradient"; + "conjure" = dontDistribute super."conjure"; + "conlogger" = dontDistribute super."conlogger"; + "connection-pool" = dontDistribute super."connection-pool"; + "consistent" = dontDistribute super."consistent"; + "console-program" = dontDistribute super."console-program"; + "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; + "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; + "consumers" = dontDistribute super."consumers"; + "container" = dontDistribute super."container"; + "container-classes" = dontDistribute super."container-classes"; + "containers-benchmark" = dontDistribute super."containers-benchmark"; + "containers-deepseq" = dontDistribute super."containers-deepseq"; + "context-free-grammar" = dontDistribute super."context-free-grammar"; + "context-stack" = dontDistribute super."context-stack"; + "continue" = dontDistribute super."continue"; + "continued-fractions" = dontDistribute super."continued-fractions"; + "continuum" = dontDistribute super."continuum"; + "continuum-client" = dontDistribute super."continuum-client"; + "contravariant-extras" = dontDistribute super."contravariant-extras"; + "control-event" = dontDistribute super."control-event"; + "control-monad-attempt" = dontDistribute super."control-monad-attempt"; + "control-monad-exception" = dontDistribute super."control-monad-exception"; + "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; + "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; + "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; + "control-monad-failure" = dontDistribute super."control-monad-failure"; + "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; + "control-monad-omega" = dontDistribute super."control-monad-omega"; + "control-monad-queue" = dontDistribute super."control-monad-queue"; + "control-timeout" = dontDistribute super."control-timeout"; + "contstuff" = dontDistribute super."contstuff"; + "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; + "contstuff-transformers" = dontDistribute super."contstuff-transformers"; + "converge" = dontDistribute super."converge"; + "conversion" = dontDistribute super."conversion"; + "conversion-bytestring" = dontDistribute super."conversion-bytestring"; + "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; + "conversion-text" = dontDistribute super."conversion-text"; + "convert" = dontDistribute super."convert"; + "convertible-ascii" = dontDistribute super."convertible-ascii"; + "convertible-text" = dontDistribute super."convertible-text"; + "cookbook" = dontDistribute super."cookbook"; + "coordinate" = dontDistribute super."coordinate"; + "copilot" = dontDistribute super."copilot"; + "copilot-c99" = dontDistribute super."copilot-c99"; + "copilot-cbmc" = dontDistribute super."copilot-cbmc"; + "copilot-core" = dontDistribute super."copilot-core"; + "copilot-language" = dontDistribute super."copilot-language"; + "copilot-libraries" = dontDistribute super."copilot-libraries"; + "copilot-sbv" = dontDistribute super."copilot-sbv"; + "copilot-theorem" = dontDistribute super."copilot-theorem"; + "copr" = dontDistribute super."copr"; + "core" = dontDistribute super."core"; + "core-haskell" = dontDistribute super."core-haskell"; + "corebot-bliki" = dontDistribute super."corebot-bliki"; + "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; + "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; + "coroutine-object" = dontDistribute super."coroutine-object"; + "couch-hs" = dontDistribute super."couch-hs"; + "couch-simple" = dontDistribute super."couch-simple"; + "couchdb-conduit" = dontDistribute super."couchdb-conduit"; + "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; + "count" = dontDistribute super."count"; + "countable" = dontDistribute super."countable"; + "counter" = dontDistribute super."counter"; + "court" = dontDistribute super."court"; + "coverage" = dontDistribute super."coverage"; + "cpio-conduit" = dontDistribute super."cpio-conduit"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; + "cpsa" = dontDistribute super."cpsa"; + "cpuid" = dontDistribute super."cpuid"; + "cpuperf" = dontDistribute super."cpuperf"; + "cpython" = dontDistribute super."cpython"; + "cqrs" = dontDistribute super."cqrs"; + "cqrs-core" = dontDistribute super."cqrs-core"; + "cqrs-example" = dontDistribute super."cqrs-example"; + "cqrs-memory" = dontDistribute super."cqrs-memory"; + "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; + "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; + "cqrs-test" = dontDistribute super."cqrs-test"; + "cqrs-testkit" = dontDistribute super."cqrs-testkit"; + "cqrs-types" = dontDistribute super."cqrs-types"; + "cr" = dontDistribute super."cr"; + "crack" = dontDistribute super."crack"; + "craftwerk" = dontDistribute super."craftwerk"; + "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; + "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crc16" = dontDistribute super."crc16"; + "crc16-table" = dontDistribute super."crc16-table"; + "creatur" = dontDistribute super."creatur"; + "crf-chain1" = dontDistribute super."crf-chain1"; + "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; + "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; + "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; + "critbit" = dontDistribute super."critbit"; + "criterion-plus" = dontDistribute super."criterion-plus"; + "criterion-to-html" = dontDistribute super."criterion-to-html"; + "crockford" = dontDistribute super."crockford"; + "crocodile" = dontDistribute super."crocodile"; + "cron" = doDistribute super."cron_0_3_0"; + "cron-compat" = dontDistribute super."cron-compat"; + "cruncher-types" = dontDistribute super."cruncher-types"; + "crunghc" = dontDistribute super."crunghc"; + "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; + "crypto-classical" = dontDistribute super."crypto-classical"; + "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; + "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; + "crypto-random-effect" = dontDistribute super."crypto-random-effect"; + "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptonite" = doDistribute super."cryptonite_0_6"; + "cryptsy-api" = dontDistribute super."cryptsy-api"; + "crystalfontz" = dontDistribute super."crystalfontz"; + "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; + "csound-catalog" = dontDistribute super."csound-catalog"; + "csound-expression" = dontDistribute super."csound-expression"; + "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; + "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; + "csound-expression-typed" = dontDistribute super."csound-expression-typed"; + "csound-sampler" = dontDistribute super."csound-sampler"; + "csp" = dontDistribute super."csp"; + "cspmchecker" = dontDistribute super."cspmchecker"; + "css" = dontDistribute super."css"; + "css-syntax" = dontDistribute super."css-syntax"; + "csv-enumerator" = dontDistribute super."csv-enumerator"; + "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-to-qif" = dontDistribute super."csv-to-qif"; + "ctemplate" = dontDistribute super."ctemplate"; + "ctkl" = dontDistribute super."ctkl"; + "ctpl" = dontDistribute super."ctpl"; + "ctrie" = dontDistribute super."ctrie"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "cubicspline" = doDistribute super."cubicspline_0_1_1"; + "cublas" = dontDistribute super."cublas"; + "cuboid" = dontDistribute super."cuboid"; + "cuda" = dontDistribute super."cuda"; + "cudd" = dontDistribute super."cudd"; + "cufft" = dontDistribute super."cufft"; + "curl-aeson" = dontDistribute super."curl-aeson"; + "curlhs" = dontDistribute super."curlhs"; + "currency" = dontDistribute super."currency"; + "current-locale" = dontDistribute super."current-locale"; + "curry-base" = dontDistribute super."curry-base"; + "curry-frontend" = dontDistribute super."curry-frontend"; + "cursedcsv" = dontDistribute super."cursedcsv"; + "curve25519" = dontDistribute super."curve25519"; + "curves" = dontDistribute super."curves"; + "custom-prelude" = dontDistribute super."custom-prelude"; + "cv-combinators" = dontDistribute super."cv-combinators"; + "cyclotomic" = dontDistribute super."cyclotomic"; + "cypher" = dontDistribute super."cypher"; + "d-bus" = dontDistribute super."d-bus"; + "d3js" = dontDistribute super."d3js"; + "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; + "daemons" = dontDistribute super."daemons"; + "dag" = dontDistribute super."dag"; + "damnpacket" = dontDistribute super."damnpacket"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "darcs" = dontDistribute super."darcs"; + "darcs-benchmark" = dontDistribute super."darcs-benchmark"; + "darcs-beta" = dontDistribute super."darcs-beta"; + "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; + "darcs-cabalized" = dontDistribute super."darcs-cabalized"; + "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; + "darcs-graph" = dontDistribute super."darcs-graph"; + "darcs-monitor" = dontDistribute super."darcs-monitor"; + "darcs-scripts" = dontDistribute super."darcs-scripts"; + "darcs2dot" = dontDistribute super."darcs2dot"; + "darcsden" = dontDistribute super."darcsden"; + "darcswatch" = dontDistribute super."darcswatch"; + "darkplaces-demo" = dontDistribute super."darkplaces-demo"; + "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; + "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; + "darkplaces-text" = dontDistribute super."darkplaces-text"; + "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; + "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; + "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; + "data-accessor-template" = dontDistribute super."data-accessor-template"; + "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; + "data-aviary" = dontDistribute super."data-aviary"; + "data-bword" = dontDistribute super."data-bword"; + "data-carousel" = dontDistribute super."data-carousel"; + "data-category" = dontDistribute super."data-category"; + "data-cell" = dontDistribute super."data-cell"; + "data-checked" = dontDistribute super."data-checked"; + "data-clist" = dontDistribute super."data-clist"; + "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; + "data-construction" = dontDistribute super."data-construction"; + "data-cycle" = dontDistribute super."data-cycle"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-endian" = dontDistribute super."data-endian"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-kiln" = dontDistribute super."data-kiln"; + "data-layer" = dontDistribute super."data-layer"; + "data-layout" = dontDistribute super."data-layout"; + "data-lens" = dontDistribute super."data-lens"; + "data-lens-fd" = dontDistribute super."data-lens-fd"; + "data-lens-ixset" = dontDistribute super."data-lens-ixset"; + "data-lens-template" = dontDistribute super."data-lens-template"; + "data-list-sequences" = dontDistribute super."data-list-sequences"; + "data-map-multikey" = dontDistribute super."data-map-multikey"; + "data-named" = dontDistribute super."data-named"; + "data-nat" = dontDistribute super."data-nat"; + "data-object" = dontDistribute super."data-object"; + "data-object-json" = dontDistribute super."data-object-json"; + "data-object-yaml" = dontDistribute super."data-object-yaml"; + "data-or" = dontDistribute super."data-or"; + "data-partition" = dontDistribute super."data-partition"; + "data-pprint" = dontDistribute super."data-pprint"; + "data-quotientref" = dontDistribute super."data-quotientref"; + "data-r-tree" = dontDistribute super."data-r-tree"; + "data-ref" = dontDistribute super."data-ref"; + "data-reify-cse" = dontDistribute super."data-reify-cse"; + "data-repr" = dontDistribute super."data-repr"; + "data-rev" = dontDistribute super."data-rev"; + "data-rope" = dontDistribute super."data-rope"; + "data-rtuple" = dontDistribute super."data-rtuple"; + "data-size" = dontDistribute super."data-size"; + "data-spacepart" = dontDistribute super."data-spacepart"; + "data-store" = dontDistribute super."data-store"; + "data-stringmap" = dontDistribute super."data-stringmap"; + "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; + "data-tensor" = dontDistribute super."data-tensor"; + "data-textual" = dontDistribute super."data-textual"; + "data-timeout" = dontDistribute super."data-timeout"; + "data-transform" = dontDistribute super."data-transform"; + "data-treify" = dontDistribute super."data-treify"; + "data-type" = dontDistribute super."data-type"; + "data-util" = dontDistribute super."data-util"; + "data-variant" = dontDistribute super."data-variant"; + "database-migrate" = dontDistribute super."database-migrate"; + "database-study" = dontDistribute super."database-study"; + "dataenc" = dontDistribute super."dataenc"; + "dataflow" = dontDistribute super."dataflow"; + "datalog" = dontDistribute super."datalog"; + "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; + "date-cache" = dontDistribute super."date-cache"; + "dates" = dontDistribute super."dates"; + "datetime" = dontDistribute super."datetime"; + "datetime-sb" = dontDistribute super."datetime-sb"; + "dawg" = dontDistribute super."dawg"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dclabel" = dontDistribute super."dclabel"; + "dclabel-eci11" = dontDistribute super."dclabel-eci11"; + "ddc-base" = dontDistribute super."ddc-base"; + "ddc-build" = dontDistribute super."ddc-build"; + "ddc-code" = dontDistribute super."ddc-code"; + "ddc-core" = dontDistribute super."ddc-core"; + "ddc-core-eval" = dontDistribute super."ddc-core-eval"; + "ddc-core-flow" = dontDistribute super."ddc-core-flow"; + "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; + "ddc-core-salt" = dontDistribute super."ddc-core-salt"; + "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; + "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; + "ddc-driver" = dontDistribute super."ddc-driver"; + "ddc-interface" = dontDistribute super."ddc-interface"; + "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; + "ddc-tools" = dontDistribute super."ddc-tools"; + "ddc-war" = dontDistribute super."ddc-war"; + "ddci-core" = dontDistribute super."ddci-core"; + "dead-code-detection" = dontDistribute super."dead-code-detection"; + "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian" = doDistribute super."debian_3_87_2"; + "debian-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "decepticons" = dontDistribute super."decepticons"; + "declarative" = dontDistribute super."declarative"; + "decode-utf8" = dontDistribute super."decode-utf8"; + "decoder-conduit" = dontDistribute super."decoder-conduit"; + "dedukti" = dontDistribute super."dedukti"; + "deepcontrol" = dontDistribute super."deepcontrol"; + "deeplearning-hs" = dontDistribute super."deeplearning-hs"; + "deepseq-bounded" = dontDistribute super."deepseq-bounded"; + "deepseq-magic" = dontDistribute super."deepseq-magic"; + "deepseq-th" = dontDistribute super."deepseq-th"; + "deepzoom" = dontDistribute super."deepzoom"; + "defargs" = dontDistribute super."defargs"; + "definitive-base" = dontDistribute super."definitive-base"; + "definitive-filesystem" = dontDistribute super."definitive-filesystem"; + "definitive-graphics" = dontDistribute super."definitive-graphics"; + "definitive-parser" = dontDistribute super."definitive-parser"; + "definitive-reactive" = dontDistribute super."definitive-reactive"; + "definitive-sound" = dontDistribute super."definitive-sound"; + "deiko-config" = dontDistribute super."deiko-config"; + "dejafu" = dontDistribute super."dejafu"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delicious" = dontDistribute super."delicious"; + "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; + "delta" = dontDistribute super."delta"; + "delta-h" = dontDistribute super."delta-h"; + "demarcate" = dontDistribute super."demarcate"; + "denominate" = dontDistribute super."denominate"; + "depends" = dontDistribute super."depends"; + "dephd" = dontDistribute super."dephd"; + "dequeue" = dontDistribute super."dequeue"; + "derangement" = dontDistribute super."derangement"; + "derivation-trees" = dontDistribute super."derivation-trees"; + "derive-IG" = dontDistribute super."derive-IG"; + "derive-enumerable" = dontDistribute super."derive-enumerable"; + "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-topdown" = dontDistribute super."derive-topdown"; + "derive-trie" = dontDistribute super."derive-trie"; + "deriving-compat" = dontDistribute super."deriving-compat"; + "derp" = dontDistribute super."derp"; + "derp-lib" = dontDistribute super."derp-lib"; + "descrilo" = dontDistribute super."descrilo"; + "despair" = dontDistribute super."despair"; + "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; + "detrospector" = dontDistribute super."detrospector"; + "deunicode" = dontDistribute super."deunicode"; + "devil" = dontDistribute super."devil"; + "dewdrop" = dontDistribute super."dewdrop"; + "dfrac" = dontDistribute super."dfrac"; + "dfsbuild" = dontDistribute super."dfsbuild"; + "dgim" = dontDistribute super."dgim"; + "dgs" = dontDistribute super."dgs"; + "dia-base" = dontDistribute super."dia-base"; + "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; + "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; + "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; + "diagrams-pdf" = dontDistribute super."diagrams-pdf"; + "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; + "dicom" = dontDistribute super."dicom"; + "dictparser" = dontDistribute super."dictparser"; + "diet" = dontDistribute super."diet"; + "diff-gestalt" = dontDistribute super."diff-gestalt"; + "diff-parse" = dontDistribute super."diff-parse"; + "diffarray" = dontDistribute super."diffarray"; + "diffcabal" = dontDistribute super."diffcabal"; + "diffdump" = dontDistribute super."diffdump"; + "digamma" = dontDistribute super."digamma"; + "digest-pure" = dontDistribute super."digest-pure"; + "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; + "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; + "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; + "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; + "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; + "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; + "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; + "digit" = dontDistribute super."digit"; + "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; + "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-tf" = dontDistribute super."dimensional-tf"; + "dingo-core" = dontDistribute super."dingo-core"; + "dingo-example" = dontDistribute super."dingo-example"; + "dingo-widgets" = dontDistribute super."dingo-widgets"; + "diophantine" = dontDistribute super."diophantine"; + "diplomacy" = dontDistribute super."diplomacy"; + "diplomacy-server" = dontDistribute super."diplomacy-server"; + "direct-binary-files" = dontDistribute super."direct-binary-files"; + "direct-daemonize" = dontDistribute super."direct-daemonize"; + "direct-fastcgi" = dontDistribute super."direct-fastcgi"; + "direct-http" = dontDistribute super."direct-http"; + "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; + "direct-plugins" = dontDistribute super."direct-plugins"; + "directed-cubical" = dontDistribute super."directed-cubical"; + "directory-layout" = dontDistribute super."directory-layout"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-process" = dontDistribute super."distributed-process"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; + "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; + "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; + "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; + "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = dontDistribute super."distributed-static"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "diversity" = dontDistribute super."diversity"; + "dixi" = dontDistribute super."dixi"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dnscache" = dontDistribute super."dnscache"; + "dnsrbl" = dontDistribute super."dnsrbl"; + "dnssd" = dontDistribute super."dnssd"; + "doc-review" = dontDistribute super."doc-review"; + "doccheck" = dontDistribute super."doccheck"; + "docidx" = dontDistribute super."docidx"; + "docker" = dontDistribute super."docker"; + "dockercook" = dontDistribute super."dockercook"; + "docopt" = dontDistribute super."docopt"; + "doctest-discover" = dontDistribute super."doctest-discover"; + "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; + "doctest-prop" = dontDistribute super."doctest-prop"; + "dom-lt" = dontDistribute super."dom-lt"; + "dom-selector" = dontDistribute super."dom-selector"; + "domain-auth" = dontDistribute super."domain-auth"; + "dominion" = dontDistribute super."dominion"; + "domplate" = dontDistribute super."domplate"; + "dot2graphml" = dontDistribute super."dot2graphml"; + "dotenv" = dontDistribute super."dotenv"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "double-metaphone" = dontDistribute super."double-metaphone"; + "dove" = dontDistribute super."dove"; + "dow" = dontDistribute super."dow"; + "download" = dontDistribute super."download"; + "download-curl" = dontDistribute super."download-curl"; + "download-media-content" = dontDistribute super."download-media-content"; + "dozenal" = dontDistribute super."dozenal"; + "dozens" = dontDistribute super."dozens"; + "dph-base" = dontDistribute super."dph-base"; + "dph-examples" = dontDistribute super."dph-examples"; + "dph-lifted-base" = dontDistribute super."dph-lifted-base"; + "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; + "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; + "dph-par" = dontDistribute super."dph-par"; + "dph-prim-interface" = dontDistribute super."dph-prim-interface"; + "dph-prim-par" = dontDistribute super."dph-prim-par"; + "dph-prim-seq" = dontDistribute super."dph-prim-seq"; + "dph-seq" = dontDistribute super."dph-seq"; + "dpkg" = dontDistribute super."dpkg"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "drawille" = dontDistribute super."drawille"; + "drifter" = dontDistribute super."drifter"; + "drifter-postgresql" = dontDistribute super."drifter-postgresql"; + "dropbox-sdk" = dontDistribute super."dropbox-sdk"; + "dropsolve" = dontDistribute super."dropsolve"; + "ds-kanren" = dontDistribute super."ds-kanren"; + "dsh-sql" = dontDistribute super."dsh-sql"; + "dsmc" = dontDistribute super."dsmc"; + "dsmc-tools" = dontDistribute super."dsmc-tools"; + "dson" = dontDistribute super."dson"; + "dson-parsec" = dontDistribute super."dson-parsec"; + "dsp" = dontDistribute super."dsp"; + "dstring" = dontDistribute super."dstring"; + "dtab" = dontDistribute super."dtab"; + "dtd" = dontDistribute super."dtd"; + "dtd-text" = dontDistribute super."dtd-text"; + "dtd-types" = dontDistribute super."dtd-types"; + "dtrace" = dontDistribute super."dtrace"; + "dtw" = dontDistribute super."dtw"; + "dump" = dontDistribute super."dump"; + "duplo" = dontDistribute super."duplo"; + "dvda" = dontDistribute super."dvda"; + "dvdread" = dontDistribute super."dvdread"; + "dvi-processing" = dontDistribute super."dvi-processing"; + "dvorak" = dontDistribute super."dvorak"; + "dwarf" = dontDistribute super."dwarf"; + "dwarf-el" = dontDistribute super."dwarf-el"; + "dwarfadt" = dontDistribute super."dwarfadt"; + "dx9base" = dontDistribute super."dx9base"; + "dx9d3d" = dontDistribute super."dx9d3d"; + "dx9d3dx" = dontDistribute super."dx9d3dx"; + "dynamic-cabal" = dontDistribute super."dynamic-cabal"; + "dynamic-graph" = dontDistribute super."dynamic-graph"; + "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; + "dynamic-loader" = dontDistribute super."dynamic-loader"; + "dynamic-mvector" = dontDistribute super."dynamic-mvector"; + "dynamic-object" = dontDistribute super."dynamic-object"; + "dynamic-plot" = dontDistribute super."dynamic-plot"; + "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = dontDistribute super."dynamic-state"; + "dynobud" = dontDistribute super."dynobud"; + "dyre" = dontDistribute super."dyre"; + "dywapitchtrack" = dontDistribute super."dywapitchtrack"; + "dzen-utils" = dontDistribute super."dzen-utils"; + "eager-sockets" = dontDistribute super."eager-sockets"; + "easy-api" = dontDistribute super."easy-api"; + "easy-bitcoin" = dontDistribute super."easy-bitcoin"; + "easyjson" = dontDistribute super."easyjson"; + "easyplot" = dontDistribute super."easyplot"; + "easyrender" = dontDistribute super."easyrender"; + "ebeats" = dontDistribute super."ebeats"; + "ebnf-bff" = dontDistribute super."ebnf-bff"; + "ec2-signature" = dontDistribute super."ec2-signature"; + "ecdsa" = dontDistribute super."ecdsa"; + "ecma262" = dontDistribute super."ecma262"; + "ecu" = dontDistribute super."ecu"; + "ed25519" = dontDistribute super."ed25519"; + "ed25519-donna" = dontDistribute super."ed25519-donna"; + "eddie" = dontDistribute super."eddie"; + "edenmodules" = dontDistribute super."edenmodules"; + "edenskel" = dontDistribute super."edenskel"; + "edentv" = dontDistribute super."edentv"; + "edge" = dontDistribute super."edge"; + "edit-distance-vector" = dontDistribute super."edit-distance-vector"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "effect-monad" = dontDistribute super."effect-monad"; + "effective-aspects" = dontDistribute super."effective-aspects"; + "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; + "effects" = dontDistribute super."effects"; + "effects-parser" = dontDistribute super."effects-parser"; + "effin" = dontDistribute super."effin"; + "egison" = dontDistribute super."egison"; + "egison-quote" = dontDistribute super."egison-quote"; + "egison-tutorial" = dontDistribute super."egison-tutorial"; + "ehaskell" = dontDistribute super."ehaskell"; + "ehs" = dontDistribute super."ehs"; + "eibd-client-simple" = dontDistribute super."eibd-client-simple"; + "eigen" = dontDistribute super."eigen"; + "either-unwrap" = dontDistribute super."either-unwrap"; + "eithers" = dontDistribute super."eithers"; + "ekg" = dontDistribute super."ekg"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = dontDistribute super."ekg-json"; + "ekg-log" = dontDistribute super."ekg-log"; + "ekg-push" = dontDistribute super."ekg-push"; + "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; + "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; + "elerea" = dontDistribute super."elerea"; + "elerea-examples" = dontDistribute super."elerea-examples"; + "elerea-sdl" = dontDistribute super."elerea-sdl"; + "elevator" = dontDistribute super."elevator"; + "elf" = dontDistribute super."elf"; + "elm-bridge" = dontDistribute super."elm-bridge"; + "elm-build-lib" = dontDistribute super."elm-build-lib"; + "elm-compiler" = dontDistribute super."elm-compiler"; + "elm-get" = dontDistribute super."elm-get"; + "elm-init" = dontDistribute super."elm-init"; + "elm-make" = dontDistribute super."elm-make"; + "elm-package" = dontDistribute super."elm-package"; + "elm-reactor" = dontDistribute super."elm-reactor"; + "elm-repl" = dontDistribute super."elm-repl"; + "elm-server" = dontDistribute super."elm-server"; + "elm-yesod" = dontDistribute super."elm-yesod"; + "elo" = dontDistribute super."elo"; + "elocrypt" = dontDistribute super."elocrypt"; + "emacs-keys" = dontDistribute super."emacs-keys"; + "email" = dontDistribute super."email"; + "email-header" = dontDistribute super."email-header"; + "email-postmark" = dontDistribute super."email-postmark"; + "email-validator" = dontDistribute super."email-validator"; + "embeddock" = dontDistribute super."embeddock"; + "embeddock-example" = dontDistribute super."embeddock-example"; + "embroidery" = dontDistribute super."embroidery"; + "emgm" = dontDistribute super."emgm"; + "empty" = dontDistribute super."empty"; + "encoding" = dontDistribute super."encoding"; + "endo" = dontDistribute super."endo"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engine-io-wai" = dontDistribute super."engine-io-wai"; + "engine-io-yesod" = dontDistribute super."engine-io-yesod"; + "engineering-units" = dontDistribute super."engineering-units"; + "enumerable" = dontDistribute super."enumerable"; + "enumerate" = dontDistribute super."enumerate"; + "enumeration" = dontDistribute super."enumeration"; + "enumerator-fd" = dontDistribute super."enumerator-fd"; + "enumerator-tf" = dontDistribute super."enumerator-tf"; + "enumfun" = dontDistribute super."enumfun"; + "enummapmap" = dontDistribute super."enummapmap"; + "enummapset" = dontDistribute super."enummapset"; + "enummapset-th" = dontDistribute super."enummapset-th"; + "enumset" = dontDistribute super."enumset"; + "env-parser" = dontDistribute super."env-parser"; + "envparse" = dontDistribute super."envparse"; + "envy" = dontDistribute super."envy"; + "epanet-haskell" = dontDistribute super."epanet-haskell"; + "epass" = dontDistribute super."epass"; + "epic" = dontDistribute super."epic"; + "epoll" = dontDistribute super."epoll"; + "eprocess" = dontDistribute super."eprocess"; + "epub" = dontDistribute super."epub"; + "epub-metadata" = dontDistribute super."epub-metadata"; + "epub-tools" = dontDistribute super."epub-tools"; + "epubname" = dontDistribute super."epubname"; + "equal-files" = dontDistribute super."equal-files"; + "equational-reasoning" = dontDistribute super."equational-reasoning"; + "erd" = dontDistribute super."erd"; + "erf-native" = dontDistribute super."erf-native"; + "erlang" = dontDistribute super."erlang"; + "eros" = dontDistribute super."eros"; + "eros-client" = dontDistribute super."eros-client"; + "eros-http" = dontDistribute super."eros-http"; + "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; + "error-continuations" = dontDistribute super."error-continuations"; + "error-list" = dontDistribute super."error-list"; + "error-loc" = dontDistribute super."error-loc"; + "error-location" = dontDistribute super."error-location"; + "error-message" = dontDistribute super."error-message"; + "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "ersatz" = dontDistribute super."ersatz"; + "ersatz-toysat" = dontDistribute super."ersatz-toysat"; + "ert" = dontDistribute super."ert"; + "esotericbot" = dontDistribute super."esotericbot"; + "ess" = dontDistribute super."ess"; + "estimator" = dontDistribute super."estimator"; + "estimators" = dontDistribute super."estimators"; + "estreps" = dontDistribute super."estreps"; + "etcd" = dontDistribute super."etcd"; + "eternal" = dontDistribute super."eternal"; + "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; + "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; + "ethereum-rlp" = dontDistribute super."ethereum-rlp"; + "ety" = dontDistribute super."ety"; + "euler" = dontDistribute super."euler"; + "euphoria" = dontDistribute super."euphoria"; + "eurofxref" = dontDistribute super."eurofxref"; + "event-driven" = dontDistribute super."event-driven"; + "event-handlers" = dontDistribute super."event-handlers"; + "event-list" = dontDistribute super."event-list"; + "event-monad" = dontDistribute super."event-monad"; + "eventloop" = dontDistribute super."eventloop"; + "eventstore" = dontDistribute super."eventstore"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = dontDistribute super."exact-pi"; + "exact-real" = dontDistribute super."exact-real"; + "exception-hierarchy" = dontDistribute super."exception-hierarchy"; + "exception-mailer" = dontDistribute super."exception-mailer"; + "exception-monads-fd" = dontDistribute super."exception-monads-fd"; + "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exherbo-cabal" = dontDistribute super."exherbo-cabal"; + "exif" = dontDistribute super."exif"; + "exinst" = dontDistribute super."exinst"; + "exinst-aeson" = dontDistribute super."exinst-aeson"; + "exinst-bytes" = dontDistribute super."exinst-bytes"; + "exinst-deepseq" = dontDistribute super."exinst-deepseq"; + "exinst-hashable" = dontDistribute super."exinst-hashable"; + "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; + "exp-pairs" = dontDistribute super."exp-pairs"; + "expand" = dontDistribute super."expand"; + "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-mvar" = dontDistribute super."expiring-mvar"; + "explain" = dontDistribute super."explain"; + "explicit-determinant" = dontDistribute super."explicit-determinant"; + "explicit-exception" = dontDistribute super."explicit-exception"; + "explicit-iomodes" = dontDistribute super."explicit-iomodes"; + "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; + "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; + "explicit-sharing" = dontDistribute super."explicit-sharing"; + "explore" = dontDistribute super."explore"; + "exposed-containers" = dontDistribute super."exposed-containers"; + "expression-parser" = dontDistribute super."expression-parser"; + "extcore" = dontDistribute super."extcore"; + "extemp" = dontDistribute super."extemp"; + "extended-categories" = dontDistribute super."extended-categories"; + "extended-reals" = dontDistribute super."extended-reals"; + "extensible" = dontDistribute super."extensible"; + "extensible-data" = dontDistribute super."extensible-data"; + "extensible-effects" = dontDistribute super."extensible-effects"; + "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; + "extractelf" = dontDistribute super."extractelf"; + "ez-couch" = dontDistribute super."ez-couch"; + "faceted" = dontDistribute super."faceted"; + "factory" = dontDistribute super."factory"; + "factual-api" = dontDistribute super."factual-api"; + "fad" = dontDistribute super."fad"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "farmhash" = dontDistribute super."farmhash"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-math" = dontDistribute super."fast-math"; + "fast-tags" = dontDistribute super."fast-tags"; + "fast-tagsoup" = dontDistribute super."fast-tagsoup"; + "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; + "fasta" = dontDistribute super."fasta"; + "fastbayes" = dontDistribute super."fastbayes"; + "fastcgi" = dontDistribute super."fastcgi"; + "fastedit" = dontDistribute super."fastedit"; + "fastirc" = dontDistribute super."fastirc"; + "fault-tree" = dontDistribute super."fault-tree"; + "fay-geoposition" = dontDistribute super."fay-geoposition"; + "fay-hsx" = dontDistribute super."fay-hsx"; + "fay-ref" = dontDistribute super."fay-ref"; + "fca" = dontDistribute super."fca"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-trash" = dontDistribute super."fdo-trash"; + "fec" = dontDistribute super."fec"; + "fedora-packages" = dontDistribute super."fedora-packages"; + "feed-cli" = dontDistribute super."feed-cli"; + "feed-collect" = dontDistribute super."feed-collect"; + "feed-crawl" = dontDistribute super."feed-crawl"; + "feed-translator" = dontDistribute super."feed-translator"; + "feed2lj" = dontDistribute super."feed2lj"; + "feed2twitter" = dontDistribute super."feed2twitter"; + "feldspar-compiler" = dontDistribute super."feldspar-compiler"; + "feldspar-language" = dontDistribute super."feldspar-language"; + "feldspar-signal" = dontDistribute super."feldspar-signal"; + "fen2s" = dontDistribute super."fen2s"; + "fences" = dontDistribute super."fences"; + "fenfire" = dontDistribute super."fenfire"; + "fez-conf" = dontDistribute super."fez-conf"; + "ffeed" = dontDistribute super."ffeed"; + "fficxx" = dontDistribute super."fficxx"; + "fficxx-runtime" = dontDistribute super."fficxx-runtime"; + "ffmpeg-light" = dontDistribute super."ffmpeg-light"; + "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fft" = dontDistribute super."fft"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; + "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; + "fgl-visualize" = dontDistribute super."fgl-visualize"; + "fibon" = dontDistribute super."fibon"; + "fibonacci" = dontDistribute super."fibonacci"; + "fields" = dontDistribute super."fields"; + "fields-json" = dontDistribute super."fields-json"; + "fieldwise" = dontDistribute super."fieldwise"; + "fig" = dontDistribute super."fig"; + "file-collection" = dontDistribute super."file-collection"; + "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; + "filecache" = dontDistribute super."filecache"; + "filediff" = dontDistribute super."filediff"; + "filepath-io-access" = dontDistribute super."filepath-io-access"; + "filepather" = dontDistribute super."filepather"; + "filestore" = dontDistribute super."filestore"; + "filesystem-conduit" = dontDistribute super."filesystem-conduit"; + "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; + "filesystem-trees" = dontDistribute super."filesystem-trees"; + "filtrable" = dontDistribute super."filtrable"; + "final" = dontDistribute super."final"; + "find-conduit" = dontDistribute super."find-conduit"; + "fingertree-tf" = dontDistribute super."fingertree-tf"; + "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; + "first-and-last" = dontDistribute super."first-and-last"; + "first-class-patterns" = dontDistribute super."first-class-patterns"; + "firstify" = dontDistribute super."firstify"; + "fishfood" = dontDistribute super."fishfood"; + "fit" = dontDistribute super."fit"; + "fitsio" = dontDistribute super."fitsio"; + "fix-imports" = dontDistribute super."fix-imports"; + "fix-parser-simple" = dontDistribute super."fix-parser-simple"; + "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; + "fixed-length" = dontDistribute super."fixed-length"; + "fixed-point" = dontDistribute super."fixed-point"; + "fixed-point-vector" = dontDistribute super."fixed-point-vector"; + "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; + "fixed-precision" = dontDistribute super."fixed-precision"; + "fixed-storable-array" = dontDistribute super."fixed-storable-array"; + "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; + "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; + "fixedprec" = dontDistribute super."fixedprec"; + "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixhs" = dontDistribute super."fixhs"; + "fixplate" = dontDistribute super."fixplate"; + "fixpoint" = dontDistribute super."fixpoint"; + "fixtime" = dontDistribute super."fixtime"; + "fizz-buzz" = dontDistribute super."fizz-buzz"; + "flaccuraterip" = dontDistribute super."flaccuraterip"; + "flamethrower" = dontDistribute super."flamethrower"; + "flamingra" = dontDistribute super."flamingra"; + "flat-maybe" = dontDistribute super."flat-maybe"; + "flat-mcmc" = dontDistribute super."flat-mcmc"; + "flat-tex" = dontDistribute super."flat-tex"; + "flexible-time" = dontDistribute super."flexible-time"; + "flexible-unlit" = dontDistribute super."flexible-unlit"; + "flexiwrap" = dontDistribute super."flexiwrap"; + "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; + "flickr" = dontDistribute super."flickr"; + "flippers" = dontDistribute super."flippers"; + "flite" = dontDistribute super."flite"; + "flo" = dontDistribute super."flo"; + "float-binstring" = dontDistribute super."float-binstring"; + "floating-bits" = dontDistribute super."floating-bits"; + "floatshow" = dontDistribute super."floatshow"; + "flow2dot" = dontDistribute super."flow2dot"; + "flowdock-api" = dontDistribute super."flowdock-api"; + "flowdock-rest" = dontDistribute super."flowdock-rest"; + "flower" = dontDistribute super."flower"; + "flowlocks-framework" = dontDistribute super."flowlocks-framework"; + "flowsim" = dontDistribute super."flowsim"; + "fltkhs" = dontDistribute super."fltkhs"; + "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fn" = dontDistribute super."fn"; + "fn-extra" = dontDistribute super."fn-extra"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; + "folds" = dontDistribute super."folds"; + "folds-common" = dontDistribute super."folds-common"; + "follower" = dontDistribute super."follower"; + "foma" = dontDistribute super."foma"; + "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; + "foo" = dontDistribute super."foo"; + "for-free" = dontDistribute super."for-free"; + "forbidden-fruit" = dontDistribute super."forbidden-fruit"; + "fordo" = dontDistribute super."fordo"; + "forecast-io" = dontDistribute super."forecast-io"; + "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; + "foreign-var" = dontDistribute super."foreign-var"; + "forger" = dontDistribute super."forger"; + "forkable-monad" = dontDistribute super."forkable-monad"; + "formal" = dontDistribute super."formal"; + "format" = dontDistribute super."format"; + "format-status" = dontDistribute super."format-status"; + "formattable" = dontDistribute super."formattable"; + "forml" = dontDistribute super."forml"; + "formlets" = dontDistribute super."formlets"; + "formlets-hsp" = dontDistribute super."formlets-hsp"; + "forth-hll" = dontDistribute super."forth-hll"; + "foscam-directory" = dontDistribute super."foscam-directory"; + "foscam-filename" = dontDistribute super."foscam-filename"; + "fountain" = dontDistribute super."fountain"; + "fpco-api" = dontDistribute super."fpco-api"; + "fpipe" = dontDistribute super."fpipe"; + "fpnla" = dontDistribute super."fpnla"; + "fpnla-examples" = dontDistribute super."fpnla-examples"; + "fptest" = dontDistribute super."fptest"; + "fquery" = dontDistribute super."fquery"; + "fractal" = dontDistribute super."fractal"; + "fractals" = dontDistribute super."fractals"; + "fraction" = dontDistribute super."fraction"; + "frag" = dontDistribute super."frag"; + "frame" = dontDistribute super."frame"; + "frame-markdown" = dontDistribute super."frame-markdown"; + "franchise" = dontDistribute super."franchise"; + "free-concurrent" = dontDistribute super."free-concurrent"; + "free-functors" = dontDistribute super."free-functors"; + "free-game" = dontDistribute super."free-game"; + "free-http" = dontDistribute super."free-http"; + "free-operational" = dontDistribute super."free-operational"; + "free-theorems" = dontDistribute super."free-theorems"; + "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; + "free-theorems-seq" = dontDistribute super."free-theorems-seq"; + "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; + "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "freekick2" = dontDistribute super."freekick2"; + "freenect" = doDistribute super."freenect_1_2"; + "freer" = dontDistribute super."freer"; + "freesect" = dontDistribute super."freesect"; + "freesound" = dontDistribute super."freesound"; + "freetype-simple" = dontDistribute super."freetype-simple"; + "freetype2" = dontDistribute super."freetype2"; + "fresh" = dontDistribute super."fresh"; + "friday" = dontDistribute super."friday"; + "friday-devil" = dontDistribute super."friday-devil"; + "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friendly-time" = dontDistribute super."friendly-time"; + "frp-arduino" = dontDistribute super."frp-arduino"; + "frpnow" = dontDistribute super."frpnow"; + "frpnow-gloss" = dontDistribute super."frpnow-gloss"; + "frpnow-gtk" = dontDistribute super."frpnow-gtk"; + "frquotes" = dontDistribute super."frquotes"; + "fs-events" = dontDistribute super."fs-events"; + "fsharp" = dontDistribute super."fsharp"; + "fsmActions" = dontDistribute super."fsmActions"; + "fst" = dontDistribute super."fst"; + "fsutils" = dontDistribute super."fsutils"; + "fswatcher" = dontDistribute super."fswatcher"; + "ftdi" = dontDistribute super."ftdi"; + "ftp-conduit" = dontDistribute super."ftp-conduit"; + "ftphs" = dontDistribute super."ftphs"; + "ftree" = dontDistribute super."ftree"; + "ftshell" = dontDistribute super."ftshell"; + "fugue" = dontDistribute super."fugue"; + "full-sessions" = dontDistribute super."full-sessions"; + "full-text-search" = dontDistribute super."full-text-search"; + "fullstop" = dontDistribute super."fullstop"; + "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; + "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcmp" = dontDistribute super."funcmp"; + "function-combine" = dontDistribute super."function-combine"; + "function-instances-algebra" = dontDistribute super."function-instances-algebra"; + "functional-arrow" = dontDistribute super."functional-arrow"; + "functional-kmp" = dontDistribute super."functional-kmp"; + "functor-apply" = dontDistribute super."functor-apply"; + "functor-combo" = dontDistribute super."functor-combo"; + "functor-infix" = dontDistribute super."functor-infix"; + "functor-monadic" = dontDistribute super."functor-monadic"; + "functor-utils" = dontDistribute super."functor-utils"; + "functorm" = dontDistribute super."functorm"; + "functors" = dontDistribute super."functors"; + "funion" = dontDistribute super."funion"; + "funpat" = dontDistribute super."funpat"; + "funsat" = dontDistribute super."funsat"; + "fusion" = dontDistribute super."fusion"; + "futun" = dontDistribute super."futun"; + "future" = dontDistribute super."future"; + "future-resource" = dontDistribute super."future-resource"; + "fuzzy" = dontDistribute super."fuzzy"; + "fuzzy-timings" = dontDistribute super."fuzzy-timings"; + "fuzzytime" = dontDistribute super."fuzzytime"; + "fwgl" = dontDistribute super."fwgl"; + "fwgl-glfw" = dontDistribute super."fwgl-glfw"; + "fwgl-javascript" = dontDistribute super."fwgl-javascript"; + "g-npm" = dontDistribute super."g-npm"; + "gact" = dontDistribute super."gact"; + "game-of-life" = dontDistribute super."game-of-life"; + "game-probability" = dontDistribute super."game-probability"; + "game-tree" = dontDistribute super."game-tree"; + "gameclock" = dontDistribute super."gameclock"; + "gamma" = dontDistribute super."gamma"; + "gang-of-threads" = dontDistribute super."gang-of-threads"; + "garepinoh" = dontDistribute super."garepinoh"; + "garsia-wachs" = dontDistribute super."garsia-wachs"; + "gbu" = dontDistribute super."gbu"; + "gc" = dontDistribute super."gc"; + "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gconf" = dontDistribute super."gconf"; + "gdiff" = dontDistribute super."gdiff"; + "gdiff-ig" = dontDistribute super."gdiff-ig"; + "gdiff-th" = dontDistribute super."gdiff-th"; + "gearbox" = dontDistribute super."gearbox"; + "geek" = dontDistribute super."geek"; + "geek-server" = dontDistribute super."geek-server"; + "gelatin" = dontDistribute super."gelatin"; + "gemstone" = dontDistribute super."gemstone"; + "gencheck" = dontDistribute super."gencheck"; + "gender" = dontDistribute super."gender"; + "genders" = dontDistribute super."genders"; + "general-prelude" = dontDistribute super."general-prelude"; + "generator" = dontDistribute super."generator"; + "generators" = dontDistribute super."generators"; + "generic-accessors" = dontDistribute super."generic-accessors"; + "generic-binary" = dontDistribute super."generic-binary"; + "generic-church" = dontDistribute super."generic-church"; + "generic-deepseq" = dontDistribute super."generic-deepseq"; + "generic-deriving" = doDistribute super."generic-deriving_1_8_0"; + "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; + "generic-maybe" = dontDistribute super."generic-maybe"; + "generic-pretty" = dontDistribute super."generic-pretty"; + "generic-server" = dontDistribute super."generic-server"; + "generic-storable" = dontDistribute super."generic-storable"; + "generic-tree" = dontDistribute super."generic-tree"; + "generic-trie" = dontDistribute super."generic-trie"; + "generic-xml" = dontDistribute super."generic-xml"; + "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; + "genericserialize" = dontDistribute super."genericserialize"; + "genetics" = dontDistribute super."genetics"; + "geni-gui" = dontDistribute super."geni-gui"; + "geni-util" = dontDistribute super."geni-util"; + "geniconvert" = dontDistribute super."geniconvert"; + "genifunctors" = dontDistribute super."genifunctors"; + "geniplate" = dontDistribute super."geniplate"; + "geniserver" = dontDistribute super."geniserver"; + "genprog" = dontDistribute super."genprog"; + "gentlemark" = dontDistribute super."gentlemark"; + "geo-resolver" = dontDistribute super."geo-resolver"; + "geo-uk" = dontDistribute super."geo-uk"; + "geocalc" = dontDistribute super."geocalc"; + "geocode-google" = dontDistribute super."geocode-google"; + "geodetic" = dontDistribute super."geodetic"; + "geodetics" = dontDistribute super."geodetics"; + "geohash" = dontDistribute super."geohash"; + "geoip2" = dontDistribute super."geoip2"; + "geojson" = dontDistribute super."geojson"; + "geom2d" = dontDistribute super."geom2d"; + "getemx" = dontDistribute super."getemx"; + "getflag" = dontDistribute super."getflag"; + "getopt-generics" = doDistribute super."getopt-generics_0_10_0_1"; + "getopt-simple" = dontDistribute super."getopt-simple"; + "gf" = dontDistribute super."gf"; + "ggtsTC" = dontDistribute super."ggtsTC"; + "ghc-core" = dontDistribute super."ghc-core"; + "ghc-core-html" = dontDistribute super."ghc-core-html"; + "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-exactprint" = dontDistribute super."ghc-exactprint"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-heap-view" = dontDistribute super."ghc-heap-view"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-session" = dontDistribute super."ghc-session"; + "ghc-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-vis" = dontDistribute super."ghc-vis"; + "ghci-diagrams" = dontDistribute super."ghci-diagrams"; + "ghci-haskeline" = dontDistribute super."ghci-haskeline"; + "ghci-lib" = dontDistribute super."ghci-lib"; + "ghci-ng" = dontDistribute super."ghci-ng"; + "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; + "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; + "ghclive" = dontDistribute super."ghclive"; + "ghczdecode" = dontDistribute super."ghczdecode"; + "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "git-fmt" = dontDistribute super."git-fmt"; + "git-freq" = dontDistribute super."git-freq"; + "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; + "git-monitor" = dontDistribute super."git-monitor"; + "git-object" = dontDistribute super."git-object"; + "git-repair" = dontDistribute super."git-repair"; + "git-sanity" = dontDistribute super."git-sanity"; + "git-vogue" = dontDistribute super."git-vogue"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github" = dontDistribute super."github"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-types" = dontDistribute super."github-types"; + "github-utils" = dontDistribute super."github-utils"; + "github-webhook-handler" = dontDistribute super."github-webhook-handler"; + "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; + "gitignore" = dontDistribute super."gitignore"; + "gitit" = dontDistribute super."gitit"; + "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; + "gitlib-cross" = dontDistribute super."gitlib-cross"; + "gitlib-s3" = dontDistribute super."gitlib-s3"; + "gitlib-sample" = dontDistribute super."gitlib-sample"; + "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glicko" = dontDistribute super."glicko"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goatee" = dontDistribute super."goatee"; + "goatee-gtk" = dontDistribute super."goatee-gtk"; + "gofer-prelude" = dontDistribute super."gofer-prelude"; + "gogol" = dontDistribute super."gogol"; + "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; + "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; + "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; + "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; + "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; + "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; + "gogol-adsense" = dontDistribute super."gogol-adsense"; + "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; + "gogol-affiliates" = dontDistribute super."gogol-affiliates"; + "gogol-analytics" = dontDistribute super."gogol-analytics"; + "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; + "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; + "gogol-appengine" = dontDistribute super."gogol-appengine"; + "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; + "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; + "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; + "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; + "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; + "gogol-appstate" = dontDistribute super."gogol-appstate"; + "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; + "gogol-bigquery" = dontDistribute super."gogol-bigquery"; + "gogol-billing" = dontDistribute super."gogol-billing"; + "gogol-blogger" = dontDistribute super."gogol-blogger"; + "gogol-books" = dontDistribute super."gogol-books"; + "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; + "gogol-classroom" = dontDistribute super."gogol-classroom"; + "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; + "gogol-compute" = dontDistribute super."gogol-compute"; + "gogol-container" = dontDistribute super."gogol-container"; + "gogol-core" = dontDistribute super."gogol-core"; + "gogol-customsearch" = dontDistribute super."gogol-customsearch"; + "gogol-dataflow" = dontDistribute super."gogol-dataflow"; + "gogol-datastore" = dontDistribute super."gogol-datastore"; + "gogol-debugger" = dontDistribute super."gogol-debugger"; + "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; + "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; + "gogol-discovery" = dontDistribute super."gogol-discovery"; + "gogol-dns" = dontDistribute super."gogol-dns"; + "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; + "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; + "gogol-drive" = dontDistribute super."gogol-drive"; + "gogol-fitness" = dontDistribute super."gogol-fitness"; + "gogol-fonts" = dontDistribute super."gogol-fonts"; + "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; + "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; + "gogol-games" = dontDistribute super."gogol-games"; + "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; + "gogol-games-management" = dontDistribute super."gogol-games-management"; + "gogol-genomics" = dontDistribute super."gogol-genomics"; + "gogol-gmail" = dontDistribute super."gogol-gmail"; + "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; + "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; + "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; + "gogol-latencytest" = dontDistribute super."gogol-latencytest"; + "gogol-logging" = dontDistribute super."gogol-logging"; + "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; + "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; + "gogol-mirror" = dontDistribute super."gogol-mirror"; + "gogol-monitoring" = dontDistribute super."gogol-monitoring"; + "gogol-oauth2" = dontDistribute super."gogol-oauth2"; + "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; + "gogol-partners" = dontDistribute super."gogol-partners"; + "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; + "gogol-plus" = dontDistribute super."gogol-plus"; + "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; + "gogol-prediction" = dontDistribute super."gogol-prediction"; + "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; + "gogol-pubsub" = dontDistribute super."gogol-pubsub"; + "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; + "gogol-replicapool" = dontDistribute super."gogol-replicapool"; + "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; + "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; + "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; + "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; + "gogol-siteverification" = dontDistribute super."gogol-siteverification"; + "gogol-spectrum" = dontDistribute super."gogol-spectrum"; + "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; + "gogol-storage" = dontDistribute super."gogol-storage"; + "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; + "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; + "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; + "gogol-translate" = dontDistribute super."gogol-translate"; + "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; + "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; + "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; + "gogol-youtube" = dontDistribute super."gogol-youtube"; + "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; + "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; + "gooey" = dontDistribute super."gooey"; + "google-cloud" = dontDistribute super."google-cloud"; + "google-dictionary" = dontDistribute super."google-dictionary"; + "google-drive" = dontDistribute super."google-drive"; + "google-html5-slide" = dontDistribute super."google-html5-slide"; + "google-mail-filters" = dontDistribute super."google-mail-filters"; + "google-oauth2" = dontDistribute super."google-oauth2"; + "google-search" = dontDistribute super."google-search"; + "google-translate" = dontDistribute super."google-translate"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpolyline" = dontDistribute super."gpolyline"; + "gps" = dontDistribute super."gps"; + "gps2htmlReport" = dontDistribute super."gps2htmlReport"; + "gpx-conduit" = dontDistribute super."gpx-conduit"; + "graceful" = dontDistribute super."graceful"; + "grammar-combinators" = dontDistribute super."grammar-combinators"; + "grapefruit-examples" = dontDistribute super."grapefruit-examples"; + "grapefruit-frp" = dontDistribute super."grapefruit-frp"; + "grapefruit-records" = dontDistribute super."grapefruit-records"; + "grapefruit-ui" = dontDistribute super."grapefruit-ui"; + "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-generators" = dontDistribute super."graph-generators"; + "graph-matchings" = dontDistribute super."graph-matchings"; + "graph-rewriting" = dontDistribute super."graph-rewriting"; + "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; + "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; + "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; + "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; + "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; + "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; + "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; + "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; + "graph-serialize" = dontDistribute super."graph-serialize"; + "graph-utils" = dontDistribute super."graph-utils"; + "graph-visit" = dontDistribute super."graph-visit"; + "graphbuilder" = dontDistribute super."graphbuilder"; + "graphene" = dontDistribute super."graphene"; + "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; + "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; + "graphicsFormats" = dontDistribute super."graphicsFormats"; + "graphicstools" = dontDistribute super."graphicstools"; + "graphmod" = dontDistribute super."graphmod"; + "graphql" = dontDistribute super."graphql"; + "graphtype" = dontDistribute super."graphtype"; + "graphviz" = dontDistribute super."graphviz"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groom" = dontDistribute super."groom"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "grouped-list" = dontDistribute super."grouped-list"; + "groupoid" = dontDistribute super."groupoid"; + "gruff" = dontDistribute super."gruff"; + "gruff-examples" = dontDistribute super."gruff-examples"; + "gsc-weighting" = dontDistribute super."gsc-weighting"; + "gsl-random" = dontDistribute super."gsl-random"; + "gsl-random-fu" = dontDistribute super."gsl-random-fu"; + "gsmenu" = dontDistribute super."gsmenu"; + "gstreamer" = dontDistribute super."gstreamer"; + "gt-tools" = dontDistribute super."gt-tools"; + "gtfs" = dontDistribute super."gtfs"; + "gtk-helpers" = dontDistribute super."gtk-helpers"; + "gtk-jsinput" = dontDistribute super."gtk-jsinput"; + "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; + "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; + "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; + "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; + "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; + "gtk-toy" = dontDistribute super."gtk-toy"; + "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; + "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; + "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; + "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; + "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; + "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; + "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; + "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; + "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; + "gtkglext" = dontDistribute super."gtkglext"; + "gtkimageview" = dontDistribute super."gtkimageview"; + "gtkrsync" = dontDistribute super."gtkrsync"; + "gtksourceview2" = dontDistribute super."gtksourceview2"; + "gtksourceview3" = dontDistribute super."gtksourceview3"; + "guarded-rewriting" = dontDistribute super."guarded-rewriting"; + "guess-combinator" = dontDistribute super."guess-combinator"; + "gulcii" = dontDistribute super."gulcii"; + "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; + "gyah-bin" = dontDistribute super."gyah-bin"; + "h-booru" = dontDistribute super."h-booru"; + "h-gpgme" = dontDistribute super."h-gpgme"; + "h2048" = dontDistribute super."h2048"; + "hArduino" = dontDistribute super."hArduino"; + "hBDD" = dontDistribute super."hBDD"; + "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; + "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; + "hCsound" = dontDistribute super."hCsound"; + "hDFA" = dontDistribute super."hDFA"; + "hF2" = dontDistribute super."hF2"; + "hGelf" = dontDistribute super."hGelf"; + "hLLVM" = dontDistribute super."hLLVM"; + "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = dontDistribute super."hOpenPGP"; + "hPDB-examples" = dontDistribute super."hPDB-examples"; + "hPushover" = dontDistribute super."hPushover"; + "hR" = dontDistribute super."hR"; + "hRESP" = dontDistribute super."hRESP"; + "hS3" = dontDistribute super."hS3"; + "hScraper" = dontDistribute super."hScraper"; + "hSimpleDB" = dontDistribute super."hSimpleDB"; + "hTalos" = dontDistribute super."hTalos"; + "hTensor" = dontDistribute super."hTensor"; + "hVOIDP" = dontDistribute super."hVOIDP"; + "hXmixer" = dontDistribute super."hXmixer"; + "haar" = dontDistribute super."haar"; + "hacanon-light" = dontDistribute super."hacanon-light"; + "hack" = dontDistribute super."hack"; + "hack-contrib" = dontDistribute super."hack-contrib"; + "hack-contrib-press" = dontDistribute super."hack-contrib-press"; + "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; + "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; + "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; + "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; + "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; + "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; + "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; + "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; + "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; + "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; + "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; + "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; + "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; + "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; + "hack2" = dontDistribute super."hack2"; + "hack2-contrib" = dontDistribute super."hack2-contrib"; + "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; + "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; + "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; + "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; + "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; + "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; + "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-plot" = dontDistribute super."hackage-plot"; + "hackage-proxy" = dontDistribute super."hackage-proxy"; + "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; + "hackage-security" = dontDistribute super."hackage-security"; + "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; + "hackage-server" = dontDistribute super."hackage-server"; + "hackage-sparks" = dontDistribute super."hackage-sparks"; + "hackage2hwn" = dontDistribute super."hackage2hwn"; + "hackage2twitter" = dontDistribute super."hackage2twitter"; + "hackager" = dontDistribute super."hackager"; + "hackernews" = dontDistribute super."hackernews"; + "hackertyper" = dontDistribute super."hackertyper"; + "hackmanager" = dontDistribute super."hackmanager"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "haddocset" = dontDistribute super."haddocset"; + "hadoop-formats" = dontDistribute super."hadoop-formats"; + "hadoop-rpc" = dontDistribute super."hadoop-rpc"; + "hadoop-tools" = dontDistribute super."hadoop-tools"; + "haeredes" = dontDistribute super."haeredes"; + "haggis" = dontDistribute super."haggis"; + "haha" = dontDistribute super."haha"; + "hailgun" = dontDistribute super."hailgun"; + "hailgun-send" = dontDistribute super."hailgun-send"; + "hails" = dontDistribute super."hails"; + "hails-bin" = dontDistribute super."hails-bin"; + "hairy" = dontDistribute super."hairy"; + "hakaru" = dontDistribute super."hakaru"; + "hake" = dontDistribute super."hake"; + "hakismet" = dontDistribute super."hakismet"; + "hako" = dontDistribute super."hako"; + "hakyll-R" = dontDistribute super."hakyll-R"; + "hakyll-agda" = dontDistribute super."hakyll-agda"; + "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; + "hakyll-contrib" = dontDistribute super."hakyll-contrib"; + "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; + "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; + "hakyll-convert" = dontDistribute super."hakyll-convert"; + "hakyll-elm" = dontDistribute super."hakyll-elm"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; + "halberd" = dontDistribute super."halberd"; + "halfs" = dontDistribute super."halfs"; + "halipeto" = dontDistribute super."halipeto"; + "halive" = dontDistribute super."halive"; + "halma" = dontDistribute super."halma"; + "haltavista" = dontDistribute super."haltavista"; + "hamid" = dontDistribute super."hamid"; + "hampp" = dontDistribute super."hampp"; + "hamtmap" = dontDistribute super."hamtmap"; + "hamusic" = dontDistribute super."hamusic"; + "handa-gdata" = dontDistribute super."handa-gdata"; + "handa-geodata" = dontDistribute super."handa-geodata"; + "handa-opengl" = dontDistribute super."handa-opengl"; + "handle-like" = dontDistribute super."handle-like"; + "handsy" = dontDistribute super."handsy"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "hapistrano" = dontDistribute super."hapistrano"; + "happindicator" = dontDistribute super."happindicator"; + "happindicator3" = dontDistribute super."happindicator3"; + "happraise" = dontDistribute super."happraise"; + "happs-hsp" = dontDistribute super."happs-hsp"; + "happs-hsp-template" = dontDistribute super."happs-hsp-template"; + "happs-tutorial" = dontDistribute super."happs-tutorial"; + "happstack" = dontDistribute super."happstack"; + "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = dontDistribute super."happstack-authenticate"; + "happstack-clientsession" = dontDistribute super."happstack-clientsession"; + "happstack-contrib" = dontDistribute super."happstack-contrib"; + "happstack-data" = dontDistribute super."happstack-data"; + "happstack-dlg" = dontDistribute super."happstack-dlg"; + "happstack-facebook" = dontDistribute super."happstack-facebook"; + "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; + "happstack-fay" = dontDistribute super."happstack-fay"; + "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; + "happstack-foundation" = dontDistribute super."happstack-foundation"; + "happstack-hamlet" = dontDistribute super."happstack-hamlet"; + "happstack-heist" = dontDistribute super."happstack-heist"; + "happstack-helpers" = dontDistribute super."happstack-helpers"; + "happstack-hsp" = dontDistribute super."happstack-hsp"; + "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-jmacro" = dontDistribute super."happstack-jmacro"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "happstack-server-tls" = dontDistribute super."happstack-server-tls"; + "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; + "happstack-state" = dontDistribute super."happstack-state"; + "happstack-static-routing" = dontDistribute super."happstack-static-routing"; + "happstack-util" = dontDistribute super."happstack-util"; + "happstack-yui" = dontDistribute super."happstack-yui"; + "happy-meta" = dontDistribute super."happy-meta"; + "happybara" = dontDistribute super."happybara"; + "happybara-webkit" = dontDistribute super."happybara-webkit"; + "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "harp" = dontDistribute super."harp"; + "harpy" = dontDistribute super."harpy"; + "has" = dontDistribute super."has"; + "has-th" = dontDistribute super."has-th"; + "hascal" = dontDistribute super."hascal"; + "hascat" = dontDistribute super."hascat"; + "hascat-lib" = dontDistribute super."hascat-lib"; + "hascat-setup" = dontDistribute super."hascat-setup"; + "hascat-system" = dontDistribute super."hascat-system"; + "hash" = dontDistribute super."hash"; + "hashable-generics" = dontDistribute super."hashable-generics"; + "hashable-time" = dontDistribute super."hashable-time"; + "hashabler" = dontDistribute super."hashabler"; + "hashed-storage" = dontDistribute super."hashed-storage"; + "hashids" = dontDistribute super."hashids"; + "hashring" = dontDistribute super."hashring"; + "hashtables-plus" = dontDistribute super."hashtables-plus"; + "hasim" = dontDistribute super."hasim"; + "hask" = dontDistribute super."hask"; + "hask-home" = dontDistribute super."hask-home"; + "haskades" = dontDistribute super."haskades"; + "haskakafka" = dontDistribute super."haskakafka"; + "haskanoid" = dontDistribute super."haskanoid"; + "haskarrow" = dontDistribute super."haskarrow"; + "haskbot-core" = dontDistribute super."haskbot-core"; + "haskdeep" = dontDistribute super."haskdeep"; + "haskdogs" = dontDistribute super."haskdogs"; + "haskeem" = dontDistribute super."haskeem"; + "haskeline" = doDistribute super."haskeline_0_7_2_1"; + "haskeline-class" = dontDistribute super."haskeline-class"; + "haskell-aliyun" = dontDistribute super."haskell-aliyun"; + "haskell-awk" = dontDistribute super."haskell-awk"; + "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; + "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; + "haskell-cnc" = dontDistribute super."haskell-cnc"; + "haskell-coffee" = dontDistribute super."haskell-coffee"; + "haskell-compression" = dontDistribute super."haskell-compression"; + "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; + "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; + "haskell-formatter" = dontDistribute super."haskell-formatter"; + "haskell-ftp" = dontDistribute super."haskell-ftp"; + "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; + "haskell-import-graph" = dontDistribute super."haskell-import-graph"; + "haskell-in-space" = dontDistribute super."haskell-in-space"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-openflow" = dontDistribute super."haskell-openflow"; + "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; + "haskell-platform-test" = dontDistribute super."haskell-platform-test"; + "haskell-plot" = dontDistribute super."haskell-plot"; + "haskell-qrencode" = dontDistribute super."haskell-qrencode"; + "haskell-read-editor" = dontDistribute super."haskell-read-editor"; + "haskell-reflect" = dontDistribute super."haskell-reflect"; + "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; + "haskell-token-utils" = dontDistribute super."haskell-token-utils"; + "haskell-tor" = dontDistribute super."haskell-tor"; + "haskell-type-exts" = dontDistribute super."haskell-type-exts"; + "haskell-typescript" = dontDistribute super."haskell-typescript"; + "haskell-tyrant" = dontDistribute super."haskell-tyrant"; + "haskell-updater" = dontDistribute super."haskell-updater"; + "haskell-xmpp" = dontDistribute super."haskell-xmpp"; + "haskell2010" = dontDistribute super."haskell2010"; + "haskell98" = dontDistribute super."haskell98"; + "haskell98libraries" = dontDistribute super."haskell98libraries"; + "haskelldb" = dontDistribute super."haskelldb"; + "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; + "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; + "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; + "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; + "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; + "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; + "haskelldb-flat" = dontDistribute super."haskelldb-flat"; + "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; + "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; + "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; + "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; + "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; + "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; + "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; + "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; + "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; + "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; + "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; + "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; + "haskelldb-th" = dontDistribute super."haskelldb-th"; + "haskelldb-wx" = dontDistribute super."haskelldb-wx"; + "haskellscrabble" = dontDistribute super."haskellscrabble"; + "haskellscript" = dontDistribute super."haskellscript"; + "haskelm" = dontDistribute super."haskelm"; + "haskgame" = dontDistribute super."haskgame"; + "haskheap" = dontDistribute super."haskheap"; + "haskhol-core" = dontDistribute super."haskhol-core"; + "haskintex" = doDistribute super."haskintex_0_5_1_0"; + "haskmon" = dontDistribute super."haskmon"; + "haskoin" = dontDistribute super."haskoin"; + "haskoin-core" = dontDistribute super."haskoin-core"; + "haskoin-crypto" = dontDistribute super."haskoin-crypto"; + "haskoin-node" = dontDistribute super."haskoin-node"; + "haskoin-protocol" = dontDistribute super."haskoin-protocol"; + "haskoin-script" = dontDistribute super."haskoin-script"; + "haskoin-util" = dontDistribute super."haskoin-util"; + "haskoin-wallet" = dontDistribute super."haskoin-wallet"; + "haskoon" = dontDistribute super."haskoon"; + "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; + "haskoon-salvia" = dontDistribute super."haskoon-salvia"; + "haskore" = dontDistribute super."haskore"; + "haskore-realtime" = dontDistribute super."haskore-realtime"; + "haskore-supercollider" = dontDistribute super."haskore-supercollider"; + "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; + "haskore-vintage" = dontDistribute super."haskore-vintage"; + "hasktags" = dontDistribute super."hasktags"; + "haslo" = dontDistribute super."haslo"; + "hasloGUI" = dontDistribute super."hasloGUI"; + "hasparql-client" = dontDistribute super."hasparql-client"; + "haspell" = dontDistribute super."haspell"; + "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hastache-aeson" = dontDistribute super."hastache-aeson"; + "haste" = dontDistribute super."haste"; + "haste-compiler" = dontDistribute super."haste-compiler"; + "haste-markup" = dontDistribute super."haste-markup"; + "haste-perch" = dontDistribute super."haste-perch"; + "hastily" = dontDistribute super."hastily"; + "hasty-hamiltonian" = dontDistribute super."hasty-hamiltonian"; + "hat" = dontDistribute super."hat"; + "hatex-guide" = dontDistribute super."hatex-guide"; + "hath" = dontDistribute super."hath"; + "hatt" = dontDistribute super."hatt"; + "haverer" = dontDistribute super."haverer"; + "hawitter" = dontDistribute super."hawitter"; + "haxl" = dontDistribute super."haxl"; + "haxl-amazonka" = dontDistribute super."haxl-amazonka"; + "haxl-facebook" = dontDistribute super."haxl-facebook"; + "haxparse" = dontDistribute super."haxparse"; + "haxr-th" = dontDistribute super."haxr-th"; + "haxy" = dontDistribute super."haxy"; + "hayland" = dontDistribute super."hayland"; + "hayoo-cli" = dontDistribute super."hayoo-cli"; + "hback" = dontDistribute super."hback"; + "hbayes" = dontDistribute super."hbayes"; + "hbb" = dontDistribute super."hbb"; + "hbcd" = dontDistribute super."hbcd"; + "hbeat" = dontDistribute super."hbeat"; + "hblas" = dontDistribute super."hblas"; + "hblock" = dontDistribute super."hblock"; + "hbro" = dontDistribute super."hbro"; + "hbro-contrib" = dontDistribute super."hbro-contrib"; + "hburg" = dontDistribute super."hburg"; + "hcc" = dontDistribute super."hcc"; + "hcg-minus" = dontDistribute super."hcg-minus"; + "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; + "hcheat" = dontDistribute super."hcheat"; + "hchesslib" = dontDistribute super."hchesslib"; + "hcltest" = dontDistribute super."hcltest"; + "hcron" = dontDistribute super."hcron"; + "hcube" = dontDistribute super."hcube"; + "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; + "hdbc-aeson" = dontDistribute super."hdbc-aeson"; + "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; + "hdbc-tuple" = dontDistribute super."hdbc-tuple"; + "hdbi" = dontDistribute super."hdbi"; + "hdbi-conduit" = dontDistribute super."hdbi-conduit"; + "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; + "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; + "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdf" = dontDistribute super."hdf"; + "hdigest" = dontDistribute super."hdigest"; + "hdirect" = dontDistribute super."hdirect"; + "hdis86" = dontDistribute super."hdis86"; + "hdiscount" = dontDistribute super."hdiscount"; + "hdm" = dontDistribute super."hdm"; + "hdph" = dontDistribute super."hdph"; + "hdph-closure" = dontDistribute super."hdph-closure"; + "headergen" = dontDistribute super."headergen"; + "heapsort" = dontDistribute super."heapsort"; + "hecc" = dontDistribute super."hecc"; + "hedis-config" = dontDistribute super."hedis-config"; + "hedis-monadic" = dontDistribute super."hedis-monadic"; + "hedis-pile" = dontDistribute super."hedis-pile"; + "hedis-simple" = dontDistribute super."hedis-simple"; + "hedis-tags" = dontDistribute super."hedis-tags"; + "hedn" = dontDistribute super."hedn"; + "hein" = dontDistribute super."hein"; + "heist-aeson" = dontDistribute super."heist-aeson"; + "heist-async" = dontDistribute super."heist-async"; + "helics" = dontDistribute super."helics"; + "helics-wai" = dontDistribute super."helics-wai"; + "helisp" = dontDistribute super."helisp"; + "helium" = dontDistribute super."helium"; + "hell" = dontDistribute super."hell"; + "hellage" = dontDistribute super."hellage"; + "hellnet" = dontDistribute super."hellnet"; + "hello" = dontDistribute super."hello"; + "helm" = dontDistribute super."helm"; + "help-esb" = dontDistribute super."help-esb"; + "hemkay" = dontDistribute super."hemkay"; + "hemkay-core" = dontDistribute super."hemkay-core"; + "hemokit" = dontDistribute super."hemokit"; + "hen" = dontDistribute super."hen"; + "henet" = dontDistribute super."henet"; + "hepevt" = dontDistribute super."hepevt"; + "her-lexer" = dontDistribute super."her-lexer"; + "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; + "herbalizer" = dontDistribute super."herbalizer"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "heroku" = dontDistribute super."heroku"; + "heroku-persistent" = dontDistribute super."heroku-persistent"; + "herringbone" = dontDistribute super."herringbone"; + "herringbone-embed" = dontDistribute super."herringbone-embed"; + "herringbone-wai" = dontDistribute super."herringbone-wai"; + "hesql" = dontDistribute super."hesql"; + "hetero-map" = dontDistribute super."hetero-map"; + "hetris" = dontDistribute super."hetris"; + "heukarya" = dontDistribute super."heukarya"; + "hevolisa" = dontDistribute super."hevolisa"; + "hevolisa-dph" = dontDistribute super."hevolisa-dph"; + "hexdump" = dontDistribute super."hexdump"; + "hexif" = dontDistribute super."hexif"; + "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; + "hexpat-lens" = dontDistribute super."hexpat-lens"; + "hexpat-pickle" = dontDistribute super."hexpat-pickle"; + "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; + "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; + "hexpr" = dontDistribute super."hexpr"; + "hexquote" = dontDistribute super."hexquote"; + "heyefi" = dontDistribute super."heyefi"; + "hfann" = dontDistribute super."hfann"; + "hfd" = dontDistribute super."hfd"; + "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; + "hfoil" = dontDistribute super."hfoil"; + "hfov" = dontDistribute super."hfov"; + "hfractal" = dontDistribute super."hfractal"; + "hfusion" = dontDistribute super."hfusion"; + "hg-buildpackage" = dontDistribute super."hg-buildpackage"; + "hgal" = dontDistribute super."hgal"; + "hgalib" = dontDistribute super."hgalib"; + "hgdbmi" = dontDistribute super."hgdbmi"; + "hgearman" = dontDistribute super."hgearman"; + "hgen" = dontDistribute super."hgen"; + "hgeometric" = dontDistribute super."hgeometric"; + "hgeometry" = dontDistribute super."hgeometry"; + "hgettext" = dontDistribute super."hgettext"; + "hgithub" = dontDistribute super."hgithub"; + "hgl-example" = dontDistribute super."hgl-example"; + "hgom" = dontDistribute super."hgom"; + "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; + "hgrib" = dontDistribute super."hgrib"; + "hharp" = dontDistribute super."hharp"; + "hi" = dontDistribute super."hi"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hidapi" = dontDistribute super."hidapi"; + "hieraclus" = dontDistribute super."hieraclus"; + "hierarchical-clustering" = dontDistribute super."hierarchical-clustering"; + "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; + "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; + "hierarchy" = dontDistribute super."hierarchy"; + "hiernotify" = dontDistribute super."hiernotify"; + "highWaterMark" = dontDistribute super."highWaterMark"; + "higher-leveldb" = dontDistribute super."higher-leveldb"; + "higherorder" = dontDistribute super."higherorder"; + "highlight-versions" = dontDistribute super."highlight-versions"; + "highlighter" = dontDistribute super."highlighter"; + "highlighter2" = dontDistribute super."highlighter2"; + "hills" = dontDistribute super."hills"; + "himerge" = dontDistribute super."himerge"; + "himg" = dontDistribute super."himg"; + "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_5_5"; + "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; + "hinduce-classifier" = dontDistribute super."hinduce-classifier"; + "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; + "hinduce-examples" = dontDistribute super."hinduce-examples"; + "hinduce-missingh" = dontDistribute super."hinduce-missingh"; + "hinquire" = dontDistribute super."hinquire"; + "hinstaller" = dontDistribute super."hinstaller"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hipbot" = dontDistribute super."hipbot"; + "hipe" = dontDistribute super."hipe"; + "hips" = dontDistribute super."hips"; + "hircules" = dontDistribute super."hircules"; + "hirt" = dontDistribute super."hirt"; + "hissmetrics" = dontDistribute super."hissmetrics"; + "hist-pl" = dontDistribute super."hist-pl"; + "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; + "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; + "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; + "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; + "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; + "hist-pl-types" = dontDistribute super."hist-pl-types"; + "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; + "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; + "historian" = dontDistribute super."historian"; + "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; + "hjs" = dontDistribute super."hjs"; + "hjson" = dontDistribute super."hjson"; + "hjson-query" = dontDistribute super."hjson-query"; + "hjsonpointer" = dontDistribute super."hjsonpointer"; + "hjsonschema" = dontDistribute super."hjsonschema"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hledger" = doDistribute super."hledger_0_26"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-interest" = dontDistribute super."hledger-interest"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-lib" = doDistribute super."hledger-lib_0_26"; + "hledger-ui" = dontDistribute super."hledger-ui"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "hledger-web" = doDistribute super."hledger-web_0_26"; + "hlibBladeRF" = dontDistribute super."hlibBladeRF"; + "hlibev" = dontDistribute super."hlibev"; + "hlibfam" = dontDistribute super."hlibfam"; + "hlogger" = dontDistribute super."hlogger"; + "hlongurl" = dontDistribute super."hlongurl"; + "hls" = dontDistribute super."hls"; + "hlwm" = dontDistribute super."hlwm"; + "hly" = dontDistribute super."hly"; + "hmark" = dontDistribute super."hmark"; + "hmarkup" = dontDistribute super."hmarkup"; + "hmatrix" = doDistribute super."hmatrix_0_16_1_5"; + "hmatrix-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-gsl" = doDistribute super."hmatrix-gsl_0_16_0_3"; + "hmatrix-gsl-stats" = doDistribute super."hmatrix-gsl-stats_0_4_1_1"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-special" = dontDistribute super."hmatrix-special"; + "hmatrix-static" = dontDistribute super."hmatrix-static"; + "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; + "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; + "hmatrix-tests" = dontDistribute super."hmatrix-tests"; + "hmeap" = dontDistribute super."hmeap"; + "hmeap-utils" = dontDistribute super."hmeap-utils"; + "hmemdb" = dontDistribute super."hmemdb"; + "hmenu" = dontDistribute super."hmenu"; + "hmidi" = dontDistribute super."hmidi"; + "hmk" = dontDistribute super."hmk"; + "hmm" = dontDistribute super."hmm"; + "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; + "hmp3" = dontDistribute super."hmp3"; + "hmpfr" = dontDistribute super."hmpfr"; + "hmt" = dontDistribute super."hmt"; + "hmt-diagrams" = dontDistribute super."hmt-diagrams"; + "hmumps" = dontDistribute super."hmumps"; + "hnetcdf" = dontDistribute super."hnetcdf"; + "hnix" = dontDistribute super."hnix"; + "hnn" = dontDistribute super."hnn"; + "hnop" = dontDistribute super."hnop"; + "ho-rewriting" = dontDistribute super."ho-rewriting"; + "hoauth" = dontDistribute super."hoauth"; + "hob" = dontDistribute super."hob"; + "hobbes" = dontDistribute super."hobbes"; + "hobbits" = dontDistribute super."hobbits"; + "hoe" = dontDistribute super."hoe"; + "hofix-mtl" = dontDistribute super."hofix-mtl"; + "hog" = dontDistribute super."hog"; + "hogg" = dontDistribute super."hogg"; + "hogre" = dontDistribute super."hogre"; + "hogre-examples" = dontDistribute super."hogre-examples"; + "hois" = dontDistribute super."hois"; + "hoist-error" = dontDistribute super."hoist-error"; + "hold-em" = dontDistribute super."hold-em"; + "hole" = dontDistribute super."hole"; + "holey-format" = dontDistribute super."holey-format"; + "homeomorphic" = dontDistribute super."homeomorphic"; + "hommage" = dontDistribute super."hommage"; + "hommage-ds" = dontDistribute super."hommage-ds"; + "homplexity" = dontDistribute super."homplexity"; + "honi" = dontDistribute super."honi"; + "honk" = dontDistribute super."honk"; + "hoobuddy" = dontDistribute super."hoobuddy"; + "hood" = dontDistribute super."hood"; + "hood-off" = dontDistribute super."hood-off"; + "hood2" = dontDistribute super."hood2"; + "hoodie" = dontDistribute super."hoodie"; + "hoodle" = dontDistribute super."hoodle"; + "hoodle-builder" = dontDistribute super."hoodle-builder"; + "hoodle-core" = dontDistribute super."hoodle-core"; + "hoodle-extra" = dontDistribute super."hoodle-extra"; + "hoodle-parser" = dontDistribute super."hoodle-parser"; + "hoodle-publish" = dontDistribute super."hoodle-publish"; + "hoodle-render" = dontDistribute super."hoodle-render"; + "hoodle-types" = dontDistribute super."hoodle-types"; + "hoogle-index" = dontDistribute super."hoogle-index"; + "hooks-dir" = dontDistribute super."hooks-dir"; + "hoovie" = dontDistribute super."hoovie"; + "hopencc" = dontDistribute super."hopencc"; + "hopencl" = dontDistribute super."hopencl"; + "hopenpgp-tools" = dontDistribute super."hopenpgp-tools"; + "hopenssl" = dontDistribute super."hopenssl"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hops" = dontDistribute super."hops"; + "hoq" = dontDistribute super."hoq"; + "horizon" = dontDistribute super."horizon"; + "hosc" = dontDistribute super."hosc"; + "hosc-json" = dontDistribute super."hosc-json"; + "hosc-utils" = dontDistribute super."hosc-utils"; + "hosts-server" = dontDistribute super."hosts-server"; + "hothasktags" = dontDistribute super."hothasktags"; + "hotswap" = dontDistribute super."hotswap"; + "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; + "hp2any-core" = dontDistribute super."hp2any-core"; + "hp2any-graph" = dontDistribute super."hp2any-graph"; + "hp2any-manager" = dontDistribute super."hp2any-manager"; + "hp2html" = dontDistribute super."hp2html"; + "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack" = dontDistribute super."hpack"; + "hpaco" = dontDistribute super."hpaco"; + "hpaco-lib" = dontDistribute super."hpaco-lib"; + "hpage" = dontDistribute super."hpage"; + "hpapi" = dontDistribute super."hpapi"; + "hpaste" = dontDistribute super."hpaste"; + "hpasteit" = dontDistribute super."hpasteit"; + "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0"; + "hpc-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc-fork" = dontDistribute super."hprotoc-fork"; + "hps" = dontDistribute super."hps"; + "hps-cairo" = dontDistribute super."hps-cairo"; + "hps-kmeans" = dontDistribute super."hps-kmeans"; + "hpuz" = dontDistribute super."hpuz"; + "hpygments" = dontDistribute super."hpygments"; + "hpylos" = dontDistribute super."hpylos"; + "hpyrg" = dontDistribute super."hpyrg"; + "hquantlib" = dontDistribute super."hquantlib"; + "hquery" = dontDistribute super."hquery"; + "hranker" = dontDistribute super."hranker"; + "hreader" = dontDistribute super."hreader"; + "hricket" = dontDistribute super."hricket"; + "hruby" = dontDistribute super."hruby"; + "hs-GeoIP" = dontDistribute super."hs-GeoIP"; + "hs-blake2" = dontDistribute super."hs-blake2"; + "hs-captcha" = dontDistribute super."hs-captcha"; + "hs-carbon" = dontDistribute super."hs-carbon"; + "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; + "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-dotnet" = dontDistribute super."hs-dotnet"; + "hs-duktape" = dontDistribute super."hs-duktape"; + "hs-excelx" = dontDistribute super."hs-excelx"; + "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; + "hs-fltk" = dontDistribute super."hs-fltk"; + "hs-gchart" = dontDistribute super."hs-gchart"; + "hs-gen-iface" = dontDistribute super."hs-gen-iface"; + "hs-gizapp" = dontDistribute super."hs-gizapp"; + "hs-inspector" = dontDistribute super."hs-inspector"; + "hs-java" = dontDistribute super."hs-java"; + "hs-json-rpc" = dontDistribute super."hs-json-rpc"; + "hs-logo" = dontDistribute super."hs-logo"; + "hs-mesos" = dontDistribute super."hs-mesos"; + "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; + "hs-pgms" = dontDistribute super."hs-pgms"; + "hs-php-session" = dontDistribute super."hs-php-session"; + "hs-pkg-config" = dontDistribute super."hs-pkg-config"; + "hs-pkpass" = dontDistribute super."hs-pkpass"; + "hs-re" = dontDistribute super."hs-re"; + "hs-scrape" = dontDistribute super."hs-scrape"; + "hs-twitter" = dontDistribute super."hs-twitter"; + "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; + "hs-vcard" = dontDistribute super."hs-vcard"; + "hs2048" = dontDistribute super."hs2048"; + "hs2bf" = dontDistribute super."hs2bf"; + "hs2dot" = dontDistribute super."hs2dot"; + "hsConfigure" = dontDistribute super."hsConfigure"; + "hsSqlite3" = dontDistribute super."hsSqlite3"; + "hsXenCtrl" = dontDistribute super."hsXenCtrl"; + "hsay" = dontDistribute super."hsay"; + "hsb2hs" = dontDistribute super."hsb2hs"; + "hsbackup" = dontDistribute super."hsbackup"; + "hsbencher" = dontDistribute super."hsbencher"; + "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; + "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; + "hsc2hs" = dontDistribute super."hsc2hs"; + "hsc3" = dontDistribute super."hsc3"; + "hsc3-auditor" = dontDistribute super."hsc3-auditor"; + "hsc3-cairo" = dontDistribute super."hsc3-cairo"; + "hsc3-data" = dontDistribute super."hsc3-data"; + "hsc3-db" = dontDistribute super."hsc3-db"; + "hsc3-dot" = dontDistribute super."hsc3-dot"; + "hsc3-forth" = dontDistribute super."hsc3-forth"; + "hsc3-graphs" = dontDistribute super."hsc3-graphs"; + "hsc3-lang" = dontDistribute super."hsc3-lang"; + "hsc3-lisp" = dontDistribute super."hsc3-lisp"; + "hsc3-plot" = dontDistribute super."hsc3-plot"; + "hsc3-process" = dontDistribute super."hsc3-process"; + "hsc3-rec" = dontDistribute super."hsc3-rec"; + "hsc3-rw" = dontDistribute super."hsc3-rw"; + "hsc3-server" = dontDistribute super."hsc3-server"; + "hsc3-sf" = dontDistribute super."hsc3-sf"; + "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; + "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; + "hsc3-utils" = dontDistribute super."hsc3-utils"; + "hscamwire" = dontDistribute super."hscamwire"; + "hscassandra" = dontDistribute super."hscassandra"; + "hscd" = dontDistribute super."hscd"; + "hsclock" = dontDistribute super."hsclock"; + "hscope" = dontDistribute super."hscope"; + "hscrtmpl" = dontDistribute super."hscrtmpl"; + "hscuid" = dontDistribute super."hscuid"; + "hscurses" = dontDistribute super."hscurses"; + "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; + "hsdif" = dontDistribute super."hsdif"; + "hsdip" = dontDistribute super."hsdip"; + "hsdns" = dontDistribute super."hsdns"; + "hsdns-cache" = dontDistribute super."hsdns-cache"; + "hsemail-ns" = dontDistribute super."hsemail-ns"; + "hsenv" = dontDistribute super."hsenv"; + "hserv" = dontDistribute super."hserv"; + "hset" = dontDistribute super."hset"; + "hsexif" = dontDistribute super."hsexif"; + "hsfacter" = dontDistribute super."hsfacter"; + "hsfcsh" = dontDistribute super."hsfcsh"; + "hsfilt" = dontDistribute super."hsfilt"; + "hsgnutls" = dontDistribute super."hsgnutls"; + "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; + "hsgsom" = dontDistribute super."hsgsom"; + "hsgtd" = dontDistribute super."hsgtd"; + "hsharc" = dontDistribute super."hsharc"; + "hsignal" = doDistribute super."hsignal_0_2_7_1"; + "hsilop" = dontDistribute super."hsilop"; + "hsimport" = dontDistribute super."hsimport"; + "hsini" = dontDistribute super."hsini"; + "hskeleton" = dontDistribute super."hskeleton"; + "hslackbuilder" = dontDistribute super."hslackbuilder"; + "hslibsvm" = dontDistribute super."hslibsvm"; + "hslinks" = dontDistribute super."hslinks"; + "hslogger-reader" = dontDistribute super."hslogger-reader"; + "hslogger-template" = dontDistribute super."hslogger-template"; + "hslogger4j" = dontDistribute super."hslogger4j"; + "hslogstash" = dontDistribute super."hslogstash"; + "hsmagick" = dontDistribute super."hsmagick"; + "hsmisc" = dontDistribute super."hsmisc"; + "hsmtpclient" = dontDistribute super."hsmtpclient"; + "hsndfile" = dontDistribute super."hsndfile"; + "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; + "hsndfile-vector" = dontDistribute super."hsndfile-vector"; + "hsnock" = dontDistribute super."hsnock"; + "hsnoise" = dontDistribute super."hsnoise"; + "hsns" = dontDistribute super."hsns"; + "hsnsq" = dontDistribute super."hsnsq"; + "hsntp" = dontDistribute super."hsntp"; + "hsoptions" = dontDistribute super."hsoptions"; + "hsp" = dontDistribute super."hsp"; + "hsp-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_1_10"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_1_10"; + "hspec-discover" = doDistribute super."hspec-discover_2_1_10"; + "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1"; + "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; + "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; + "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; + "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff"; + "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_1_7"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; + "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; + "hspec-test-framework" = dontDistribute super."hspec-test-framework"; + "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; + "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "hstatistics" = doDistribute super."hstatistics_0_2_5_2"; + "hstats" = dontDistribute super."hstats"; + "hstest" = dontDistribute super."hstest"; + "hstidy" = dontDistribute super."hstidy"; + "hstorchat" = dontDistribute super."hstorchat"; + "hstradeking" = dontDistribute super."hstradeking"; + "hstyle" = dontDistribute super."hstyle"; + "hstzaar" = dontDistribute super."hstzaar"; + "hsubconvert" = dontDistribute super."hsubconvert"; + "hsverilog" = dontDistribute super."hsverilog"; + "hswip" = dontDistribute super."hswip"; + "hsx" = dontDistribute super."hsx"; + "hsx-jmacro" = dontDistribute super."hsx-jmacro"; + "hsx-xhtml" = dontDistribute super."hsx-xhtml"; + "hsx2hs" = dontDistribute super."hsx2hs"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; + "htags" = dontDistribute super."htags"; + "htar" = dontDistribute super."htar"; + "htiled" = dontDistribute super."htiled"; + "htime" = dontDistribute super."htime"; + "html-email-validate" = dontDistribute super."html-email-validate"; + "html-entities" = dontDistribute super."html-entities"; + "html-kure" = dontDistribute super."html-kure"; + "html-minimalist" = dontDistribute super."html-minimalist"; + "html-rules" = dontDistribute super."html-rules"; + "html-tokenizer" = dontDistribute super."html-tokenizer"; + "html-truncate" = dontDistribute super."html-truncate"; + "html2hamlet" = dontDistribute super."html2hamlet"; + "html5-entity" = dontDistribute super."html5-entity"; + "htodo" = dontDistribute super."htodo"; + "htoml" = dontDistribute super."htoml"; + "htrace" = dontDistribute super."htrace"; + "hts" = dontDistribute super."hts"; + "htsn" = dontDistribute super."htsn"; + "htsn-common" = dontDistribute super."htsn-common"; + "htsn-import" = dontDistribute super."htsn-import"; + "http-accept" = dontDistribute super."http-accept"; + "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client-auth" = dontDistribute super."http-client-auth"; + "http-client-conduit" = dontDistribute super."http-client-conduit"; + "http-client-lens" = dontDistribute super."http-client-lens"; + "http-client-multipart" = dontDistribute super."http-client-multipart"; + "http-client-openssl" = dontDistribute super."http-client-openssl"; + "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-conduit-browser" = dontDistribute super."http-conduit-browser"; + "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; + "http-encodings" = dontDistribute super."http-encodings"; + "http-enumerator" = dontDistribute super."http-enumerator"; + "http-kit" = dontDistribute super."http-kit"; + "http-link-header" = dontDistribute super."http-link-header"; + "http-listen" = dontDistribute super."http-listen"; + "http-monad" = dontDistribute super."http-monad"; + "http-proxy" = dontDistribute super."http-proxy"; + "http-querystring" = dontDistribute super."http-querystring"; + "http-server" = dontDistribute super."http-server"; + "http-shed" = dontDistribute super."http-shed"; + "http-test" = dontDistribute super."http-test"; + "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_0_4"; + "httpd-shed" = dontDistribute super."httpd-shed"; + "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; + "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; + "httpspec" = dontDistribute super."httpspec"; + "htune" = dontDistribute super."htune"; + "htzaar" = dontDistribute super."htzaar"; + "hub" = dontDistribute super."hub"; + "hubigraph" = dontDistribute super."hubigraph"; + "hubris" = dontDistribute super."hubris"; + "huckleberry" = dontDistribute super."huckleberry"; + "huffman" = dontDistribute super."huffman"; + "hugs2yc" = dontDistribute super."hugs2yc"; + "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = dontDistribute super."human-readable-duration"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hvect" = doDistribute super."hvect_0_2_0_0"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "hworker" = dontDistribute super."hworker"; + "hworker-ses" = dontDistribute super."hworker-ses"; + "hws" = dontDistribute super."hws"; + "hwsl2" = dontDistribute super."hwsl2"; + "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; + "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; + "hx" = dontDistribute super."hx"; + "hxmppc" = dontDistribute super."hxmppc"; + "hxournal" = dontDistribute super."hxournal"; + "hxt-binary" = dontDistribute super."hxt-binary"; + "hxt-cache" = dontDistribute super."hxt-cache"; + "hxt-extras" = dontDistribute super."hxt-extras"; + "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-xpath" = dontDistribute super."hxt-xpath"; + "hxt-xslt" = dontDistribute super."hxt-xslt"; + "hxthelper" = dontDistribute super."hxthelper"; + "hxweb" = dontDistribute super."hxweb"; + "hyahtzee" = dontDistribute super."hyahtzee"; + "hyakko" = dontDistribute super."hyakko"; + "hybrid" = dontDistribute super."hybrid"; + "hybrid-vectors" = dontDistribute super."hybrid-vectors"; + "hydra-hs" = dontDistribute super."hydra-hs"; + "hydra-print" = dontDistribute super."hydra-print"; + "hydrogen" = dontDistribute super."hydrogen"; + "hydrogen-cli" = dontDistribute super."hydrogen-cli"; + "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; + "hydrogen-data" = dontDistribute super."hydrogen-data"; + "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; + "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; + "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; + "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; + "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; + "hydrogen-util" = dontDistribute super."hydrogen-util"; + "hydrogen-version" = dontDistribute super."hydrogen-version"; + "hyena" = dontDistribute super."hyena"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperloglog" = doDistribute super."hyperloglog_0_3_4"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzk" = dontDistribute super."hzk"; + "hzulip" = dontDistribute super."hzulip"; + "i18n" = dontDistribute super."i18n"; + "iCalendar" = dontDistribute super."iCalendar"; + "iException" = dontDistribute super."iException"; + "iap-verifier" = dontDistribute super."iap-verifier"; + "ib-api" = dontDistribute super."ib-api"; + "iban" = dontDistribute super."iban"; + "ical" = dontDistribute super."ical"; + "iconv" = dontDistribute super."iconv"; + "ideas" = dontDistribute super."ideas"; + "ideas-math" = dontDistribute super."ideas-math"; + "idempotent" = dontDistribute super."idempotent"; + "identifiers" = dontDistribute super."identifiers"; + "idiii" = dontDistribute super."idiii"; + "idna" = dontDistribute super."idna"; + "idna2008" = dontDistribute super."idna2008"; + "idris" = dontDistribute super."idris"; + "ieee" = dontDistribute super."ieee"; + "ieee-utils" = dontDistribute super."ieee-utils"; + "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; + "ieee754-parser" = dontDistribute super."ieee754-parser"; + "ifcxt" = dontDistribute super."ifcxt"; + "iff" = dontDistribute super."iff"; + "ifscs" = dontDistribute super."ifscs"; + "ig" = dontDistribute super."ig"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "ihaskell" = doDistribute super."ihaskell_0_6_5_0"; + "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; + "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; + "ihttp" = dontDistribute super."ihttp"; + "illuminate" = dontDistribute super."illuminate"; + "image-type" = dontDistribute super."image-type"; + "imagefilters" = dontDistribute super."imagefilters"; + "imagemagick" = dontDistribute super."imagemagick"; + "imagepaste" = dontDistribute super."imagepaste"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; + "implicit" = dontDistribute super."implicit"; + "implicit-params" = dontDistribute super."implicit-params"; + "imports" = dontDistribute super."imports"; + "improve" = dontDistribute super."improve"; + "inc-ref" = dontDistribute super."inc-ref"; + "inch" = dontDistribute super."inch"; + "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; + "increments" = dontDistribute super."increments"; + "indentation" = dontDistribute super."indentation"; + "indentparser" = dontDistribute super."indentparser"; + "index-core" = dontDistribute super."index-core"; + "indexed" = dontDistribute super."indexed"; + "indexed-do-notation" = dontDistribute super."indexed-do-notation"; + "indexed-extras" = dontDistribute super."indexed-extras"; + "indexed-free" = dontDistribute super."indexed-free"; + "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; + "indices" = dontDistribute super."indices"; + "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; + "infer-upstream" = dontDistribute super."infer-upstream"; + "infernu" = dontDistribute super."infernu"; + "infinite-search" = dontDistribute super."infinite-search"; + "infinity" = dontDistribute super."infinity"; + "infix" = dontDistribute super."infix"; + "inflist" = dontDistribute super."inflist"; + "influxdb" = dontDistribute super."influxdb"; + "informative" = dontDistribute super."informative"; + "inilist" = dontDistribute super."inilist"; + "inject" = dontDistribute super."inject"; + "inject-function" = dontDistribute super."inject-function"; + "inline-c" = dontDistribute super."inline-c"; + "inline-c-cpp" = dontDistribute super."inline-c-cpp"; + "inline-c-win32" = dontDistribute super."inline-c-win32"; + "inline-r" = dontDistribute super."inline-r"; + "inquire" = dontDistribute super."inquire"; + "inserts" = dontDistribute super."inserts"; + "inspection-proxy" = dontDistribute super."inspection-proxy"; + "instant-aeson" = dontDistribute super."instant-aeson"; + "instant-bytes" = dontDistribute super."instant-bytes"; + "instant-deepseq" = dontDistribute super."instant-deepseq"; + "instant-generics" = dontDistribute super."instant-generics"; + "instant-hashable" = dontDistribute super."instant-hashable"; + "instant-zipper" = dontDistribute super."instant-zipper"; + "instinct" = dontDistribute super."instinct"; + "instrument-chord" = dontDistribute super."instrument-chord"; + "int-cast" = dontDistribute super."int-cast"; + "integer-pure" = dontDistribute super."integer-pure"; + "intel-aes" = dontDistribute super."intel-aes"; + "interchangeable" = dontDistribute super."interchangeable"; + "interleavableGen" = dontDistribute super."interleavableGen"; + "interleavableIO" = dontDistribute super."interleavableIO"; + "interleave" = dontDistribute super."interleave"; + "interlude" = dontDistribute super."interlude"; + "intern" = dontDistribute super."intern"; + "internetmarke" = dontDistribute super."internetmarke"; + "interpol" = dontDistribute super."interpol"; + "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; + "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; + "interpolation" = dontDistribute super."interpolation"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "io-region" = dontDistribute super."io-region"; + "io-storage" = dontDistribute super."io-storage"; + "io-streams-http" = dontDistribute super."io-streams-http"; + "io-throttle" = dontDistribute super."io-throttle"; + "ioctl" = dontDistribute super."ioctl"; + "ioref-stable" = dontDistribute super."ioref-stable"; + "iothread" = dontDistribute super."iothread"; + "iotransaction" = dontDistribute super."iotransaction"; + "ip-quoter" = dontDistribute super."ip-quoter"; + "ipatch" = dontDistribute super."ipatch"; + "ipc" = dontDistribute super."ipc"; + "ipcvar" = dontDistribute super."ipcvar"; + "ipopt-hs" = dontDistribute super."ipopt-hs"; + "ipprint" = dontDistribute super."ipprint"; + "iproute" = doDistribute super."iproute_1_5_0"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3"; + "irc" = dontDistribute super."irc"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = dontDistribute super."irc-client"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-conduit" = dontDistribute super."irc-conduit"; + "irc-core" = dontDistribute super."irc-core"; + "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-fun-bot" = dontDistribute super."irc-fun-bot"; + "irc-fun-client" = dontDistribute super."irc-fun-client"; + "irc-fun-color" = dontDistribute super."irc-fun-color"; + "irc-fun-messages" = dontDistribute super."irc-fun-messages"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iron-mq" = dontDistribute super."iron-mq"; + "ironforge" = dontDistribute super."ironforge"; + "is" = dontDistribute super."is"; + "isdicom" = dontDistribute super."isdicom"; + "isevaluated" = dontDistribute super."isevaluated"; + "isiz" = dontDistribute super."isiz"; + "ismtp" = dontDistribute super."ismtp"; + "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; + "iso8601-time" = dontDistribute super."iso8601-time"; + "isohunt" = dontDistribute super."isohunt"; + "itanium-abi" = dontDistribute super."itanium-abi"; + "iter-stats" = dontDistribute super."iter-stats"; + "iterIO" = dontDistribute super."iterIO"; + "iteratee" = dontDistribute super."iteratee"; + "iteratee-compress" = dontDistribute super."iteratee-compress"; + "iteratee-mtl" = dontDistribute super."iteratee-mtl"; + "iteratee-parsec" = dontDistribute super."iteratee-parsec"; + "iteratee-stm" = dontDistribute super."iteratee-stm"; + "iterio-server" = dontDistribute super."iterio-server"; + "ivar-simple" = dontDistribute super."ivar-simple"; + "ivor" = dontDistribute super."ivor"; + "ivory" = dontDistribute super."ivory"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-examples" = dontDistribute super."ivory-examples"; + "ivory-hw" = dontDistribute super."ivory-hw"; + "ivory-opts" = dontDistribute super."ivory-opts"; + "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ix-shapable" = dontDistribute super."ix-shapable"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "ixset" = dontDistribute super."ixset"; + "ixset-typed" = dontDistribute super."ixset-typed"; + "iyql" = dontDistribute super."iyql"; + "j2hs" = dontDistribute super."j2hs"; + "ja-base-extra" = dontDistribute super."ja-base-extra"; + "jack" = dontDistribute super."jack"; + "jack-bindings" = dontDistribute super."jack-bindings"; + "jackminimix" = dontDistribute super."jackminimix"; + "jacobi-roots" = dontDistribute super."jacobi-roots"; + "jail" = dontDistribute super."jail"; + "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; + "jalaali" = dontDistribute super."jalaali"; + "jalla" = dontDistribute super."jalla"; + "jammittools" = dontDistribute super."jammittools"; + "jarfind" = dontDistribute super."jarfind"; + "java-bridge" = dontDistribute super."java-bridge"; + "java-bridge-extras" = dontDistribute super."java-bridge-extras"; + "java-character" = dontDistribute super."java-character"; + "java-reflect" = dontDistribute super."java-reflect"; + "javasf" = dontDistribute super."javasf"; + "javav" = dontDistribute super."javav"; + "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; + "jdi" = dontDistribute super."jdi"; + "jespresso" = dontDistribute super."jespresso"; + "jobqueue" = dontDistribute super."jobqueue"; + "join" = dontDistribute super."join"; + "joinlist" = dontDistribute super."joinlist"; + "jonathanscard" = dontDistribute super."jonathanscard"; + "jort" = dontDistribute super."jort"; + "jose" = dontDistribute super."jose"; + "jose-jwt" = doDistribute super."jose-jwt_0_6_2"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "jsaddle" = dontDistribute super."jsaddle"; + "jsaddle-hello" = dontDistribute super."jsaddle-hello"; + "jsc" = dontDistribute super."jsc"; + "jsmw" = dontDistribute super."jsmw"; + "json-assertions" = dontDistribute super."json-assertions"; + "json-b" = dontDistribute super."json-b"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-python" = dontDistribute super."json-python"; + "json-qq" = dontDistribute super."json-qq"; + "json-rpc" = dontDistribute super."json-rpc"; + "json-rpc-client" = dontDistribute super."json-rpc-client"; + "json-rpc-server" = dontDistribute super."json-rpc-server"; + "json-sop" = dontDistribute super."json-sop"; + "json-state" = dontDistribute super."json-state"; + "json-stream" = dontDistribute super."json-stream"; + "json-togo" = dontDistribute super."json-togo"; + "json-tools" = dontDistribute super."json-tools"; + "json-types" = dontDistribute super."json-types"; + "json2" = dontDistribute super."json2"; + "json2-hdbc" = dontDistribute super."json2-hdbc"; + "json2-types" = dontDistribute super."json2-types"; + "json2yaml" = dontDistribute super."json2yaml"; + "jsonresume" = dontDistribute super."jsonresume"; + "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; + "jsonschema-gen" = dontDistribute super."jsonschema-gen"; + "jsonsql" = dontDistribute super."jsonsql"; + "jsontsv" = dontDistribute super."jsontsv"; + "jspath" = dontDistribute super."jspath"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = dontDistribute super."kansas-comet"; + "kansas-lava" = dontDistribute super."kansas-lava"; + "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; + "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; + "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; + "karakuri" = dontDistribute super."karakuri"; + "karver" = dontDistribute super."karver"; + "katt" = dontDistribute super."katt"; + "kbq-gu" = dontDistribute super."kbq-gu"; + "kd-tree" = dontDistribute super."kd-tree"; + "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; + "keera-callbacks" = dontDistribute super."keera-callbacks"; + "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; + "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; + "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; + "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; + "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; + "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; + "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; + "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; + "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; + "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; + "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; + "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; + "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; + "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; + "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; + "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; + "keera-posture" = dontDistribute super."keera-posture"; + "keiretsu" = dontDistribute super."keiretsu"; + "kevin" = dontDistribute super."kevin"; + "keyed" = dontDistribute super."keyed"; + "keyring" = dontDistribute super."keyring"; + "keystore" = dontDistribute super."keystore"; + "keyvaluehash" = dontDistribute super."keyvaluehash"; + "keyword-args" = dontDistribute super."keyword-args"; + "kibro" = dontDistribute super."kibro"; + "kicad-data" = dontDistribute super."kicad-data"; + "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; + "kickchan" = dontDistribute super."kickchan"; + "kif-parser" = dontDistribute super."kif-parser"; + "kinds" = dontDistribute super."kinds"; + "kit" = dontDistribute super."kit"; + "kmeans-par" = dontDistribute super."kmeans-par"; + "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knots" = dontDistribute super."knots"; + "koellner-phonetic" = dontDistribute super."koellner-phonetic"; + "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; + "korfu" = dontDistribute super."korfu"; + "kqueue" = dontDistribute super."kqueue"; + "kraken" = dontDistribute super."kraken"; + "krpc" = dontDistribute super."krpc"; + "ks-test" = dontDistribute super."ks-test"; + "ktx" = dontDistribute super."ktx"; + "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; + "kyotocabinet" = dontDistribute super."kyotocabinet"; + "l-bfgs-b" = dontDistribute super."l-bfgs-b"; + "labeled-graph" = dontDistribute super."labeled-graph"; + "labeled-tree" = dontDistribute super."labeled-tree"; + "laborantin-hs" = dontDistribute super."laborantin-hs"; + "labyrinth" = dontDistribute super."labyrinth"; + "labyrinth-server" = dontDistribute super."labyrinth-server"; + "lackey" = dontDistribute super."lackey"; + "lagrangian" = dontDistribute super."lagrangian"; + "laika" = dontDistribute super."laika"; + "lambda-ast" = dontDistribute super."lambda-ast"; + "lambda-bridge" = dontDistribute super."lambda-bridge"; + "lambda-canvas" = dontDistribute super."lambda-canvas"; + "lambda-devs" = dontDistribute super."lambda-devs"; + "lambda-options" = dontDistribute super."lambda-options"; + "lambda-placeholders" = dontDistribute super."lambda-placeholders"; + "lambda-toolbox" = dontDistribute super."lambda-toolbox"; + "lambda2js" = dontDistribute super."lambda2js"; + "lambdaBase" = dontDistribute super."lambdaBase"; + "lambdaFeed" = dontDistribute super."lambdaFeed"; + "lambdaLit" = dontDistribute super."lambdaLit"; + "lambdabot-utils" = dontDistribute super."lambdabot-utils"; + "lambdacat" = dontDistribute super."lambdacat"; + "lambdacms-core" = dontDistribute super."lambdacms-core"; + "lambdacms-media" = dontDistribute super."lambdacms-media"; + "lambdacube" = dontDistribute super."lambdacube"; + "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-core" = dontDistribute super."lambdacube-core"; + "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; + "lambdacube-engine" = dontDistribute super."lambdacube-engine"; + "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdiff" = dontDistribute super."lambdiff"; + "lame-tester" = dontDistribute super."lame-tester"; + "language-asn1" = dontDistribute super."language-asn1"; + "language-bash" = dontDistribute super."language-bash"; + "language-boogie" = dontDistribute super."language-boogie"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-cil" = dontDistribute super."language-cil"; + "language-css" = dontDistribute super."language-css"; + "language-dot" = dontDistribute super."language-dot"; + "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; + "language-eiffel" = dontDistribute super."language-eiffel"; + "language-fortran" = dontDistribute super."language-fortran"; + "language-gcl" = dontDistribute super."language-gcl"; + "language-go" = dontDistribute super."language-go"; + "language-guess" = dontDistribute super."language-guess"; + "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-kort" = dontDistribute super."language-kort"; + "language-lua" = dontDistribute super."language-lua"; + "language-lua-qq" = dontDistribute super."language-lua-qq"; + "language-lua2" = dontDistribute super."language-lua2"; + "language-mixal" = dontDistribute super."language-mixal"; + "language-nix" = dontDistribute super."language-nix"; + "language-objc" = dontDistribute super."language-objc"; + "language-openscad" = dontDistribute super."language-openscad"; + "language-pig" = dontDistribute super."language-pig"; + "language-puppet" = dontDistribute super."language-puppet"; + "language-python" = dontDistribute super."language-python"; + "language-python-colour" = dontDistribute super."language-python-colour"; + "language-python-test" = dontDistribute super."language-python-test"; + "language-qux" = dontDistribute super."language-qux"; + "language-sh" = dontDistribute super."language-sh"; + "language-slice" = dontDistribute super."language-slice"; + "language-spelling" = dontDistribute super."language-spelling"; + "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = dontDistribute super."language-thrift"; + "language-typescript" = dontDistribute super."language-typescript"; + "language-vhdl" = dontDistribute super."language-vhdl"; + "lat" = dontDistribute super."lat"; + "latest-npm-version" = dontDistribute super."latest-npm-version"; + "latex" = dontDistribute super."latex"; + "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; + "lattices" = doDistribute super."lattices_1_3"; + "launchpad-control" = dontDistribute super."launchpad-control"; + "lax" = dontDistribute super."lax"; + "layers" = dontDistribute super."layers"; + "layers-game" = dontDistribute super."layers-game"; + "layout" = dontDistribute super."layout"; + "layout-bootstrap" = dontDistribute super."layout-bootstrap"; + "lazy-io" = dontDistribute super."lazy-io"; + "lazyarray" = dontDistribute super."lazyarray"; + "lazyio" = dontDistribute super."lazyio"; + "lazysplines" = dontDistribute super."lazysplines"; + "lbfgs" = dontDistribute super."lbfgs"; + "lcs" = dontDistribute super."lcs"; + "lda" = dontDistribute super."lda"; + "ldap-client" = dontDistribute super."ldap-client"; + "ldif" = dontDistribute super."ldif"; + "leaf" = dontDistribute super."leaf"; + "leaky" = dontDistribute super."leaky"; + "leankit-api" = dontDistribute super."leankit-api"; + "leapseconds-announced" = dontDistribute super."leapseconds-announced"; + "learn" = dontDistribute super."learn"; + "learn-physics" = dontDistribute super."learn-physics"; + "learn-physics-examples" = dontDistribute super."learn-physics-examples"; + "learning-hmm" = dontDistribute super."learning-hmm"; + "leetify" = dontDistribute super."leetify"; + "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; + "lendingclub" = dontDistribute super."lendingclub"; + "lens" = doDistribute super."lens_4_12_3"; + "lens-datetime" = dontDistribute super."lens-datetime"; + "lens-prelude" = dontDistribute super."lens-prelude"; + "lens-properties" = dontDistribute super."lens-properties"; + "lens-regex" = dontDistribute super."lens-regex"; + "lens-sop" = dontDistribute super."lens-sop"; + "lens-text-encoding" = dontDistribute super."lens-text-encoding"; + "lens-time" = dontDistribute super."lens-time"; + "lens-tutorial" = dontDistribute super."lens-tutorial"; + "lens-utils" = dontDistribute super."lens-utils"; + "lenses" = dontDistribute super."lenses"; + "lensref" = dontDistribute super."lensref"; + "lentil" = dontDistribute super."lentil"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell" = dontDistribute super."leveldb-haskell"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lgtk" = dontDistribute super."lgtk"; + "lha" = dontDistribute super."lha"; + "lhae" = dontDistribute super."lhae"; + "lhc" = dontDistribute super."lhc"; + "lhe" = dontDistribute super."lhe"; + "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; + "lhs2html" = dontDistribute super."lhs2html"; + "lhslatex" = dontDistribute super."lhslatex"; + "libGenI" = dontDistribute super."libGenI"; + "libarchive-conduit" = dontDistribute super."libarchive-conduit"; + "libconfig" = dontDistribute super."libconfig"; + "libcspm" = dontDistribute super."libcspm"; + "libexpect" = dontDistribute super."libexpect"; + "libffi" = dontDistribute super."libffi"; + "libgraph" = dontDistribute super."libgraph"; + "libhbb" = dontDistribute super."libhbb"; + "libinfluxdb" = dontDistribute super."libinfluxdb"; + "libjenkins" = dontDistribute super."libjenkins"; + "liblastfm" = dontDistribute super."liblastfm"; + "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; + "libltdl" = dontDistribute super."libltdl"; + "libmpd" = dontDistribute super."libmpd"; + "libnvvm" = dontDistribute super."libnvvm"; + "liboleg" = dontDistribute super."liboleg"; + "libpafe" = dontDistribute super."libpafe"; + "libpq" = dontDistribute super."libpq"; + "librandomorg" = dontDistribute super."librandomorg"; + "libravatar" = dontDistribute super."libravatar"; + "libssh2" = dontDistribute super."libssh2"; + "libssh2-conduit" = dontDistribute super."libssh2-conduit"; + "libstackexchange" = dontDistribute super."libstackexchange"; + "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libsystemd-journal" = dontDistribute super."libsystemd-journal"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxml" = dontDistribute super."libxml"; + "libxml-enumerator" = dontDistribute super."libxml-enumerator"; + "libxslt" = dontDistribute super."libxslt"; + "life" = dontDistribute super."life"; + "lift-generics" = dontDistribute super."lift-generics"; + "lifted-threads" = dontDistribute super."lifted-threads"; + "lifter" = dontDistribute super."lifter"; + "ligature" = dontDistribute super."ligature"; + "ligd" = dontDistribute super."ligd"; + "lighttpd-conf" = dontDistribute super."lighttpd-conf"; + "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; + "lilypond" = dontDistribute super."lilypond"; + "limp" = dontDistribute super."limp"; + "limp-cbc" = dontDistribute super."limp-cbc"; + "lin-alg" = dontDistribute super."lin-alg"; + "linda" = dontDistribute super."linda"; + "lindenmayer" = dontDistribute super."lindenmayer"; + "line-break" = dontDistribute super."line-break"; + "line2pdf" = dontDistribute super."line2pdf"; + "linear" = doDistribute super."linear_1_19_1_3"; + "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "linode" = dontDistribute super."linode"; + "linux-blkid" = dontDistribute super."linux-blkid"; + "linux-cgroup" = dontDistribute super."linux-cgroup"; + "linux-evdev" = dontDistribute super."linux-evdev"; + "linux-inotify" = dontDistribute super."linux-inotify"; + "linux-kmod" = dontDistribute super."linux-kmod"; + "linux-mount" = dontDistribute super."linux-mount"; + "linux-perf" = dontDistribute super."linux-perf"; + "linux-ptrace" = dontDistribute super."linux-ptrace"; + "linux-xattr" = dontDistribute super."linux-xattr"; + "linx-gateway" = dontDistribute super."linx-gateway"; + "lio" = dontDistribute super."lio"; + "lio-eci11" = dontDistribute super."lio-eci11"; + "lio-fs" = dontDistribute super."lio-fs"; + "lio-simple" = dontDistribute super."lio-simple"; + "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; + "liquidhaskell" = dontDistribute super."liquidhaskell"; + "lispparser" = dontDistribute super."lispparser"; + "list-extras" = dontDistribute super."list-extras"; + "list-grouping" = dontDistribute super."list-grouping"; + "list-mux" = dontDistribute super."list-mux"; + "list-remote-forwards" = dontDistribute super."list-remote-forwards"; + "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; + "list-t-html-parser" = dontDistribute super."list-t-html-parser"; + "list-t-http-client" = dontDistribute super."list-t-http-client"; + "list-t-libcurl" = dontDistribute super."list-t-libcurl"; + "list-t-text" = dontDistribute super."list-t-text"; + "list-tries" = dontDistribute super."list-tries"; + "listlike-instances" = dontDistribute super."listlike-instances"; + "lists" = dontDistribute super."lists"; + "listsafe" = dontDistribute super."listsafe"; + "lit" = dontDistribute super."lit"; + "literals" = dontDistribute super."literals"; + "live-sequencer" = dontDistribute super."live-sequencer"; + "ll-picosat" = dontDistribute super."ll-picosat"; + "llrbtree" = dontDistribute super."llrbtree"; + "llsd" = dontDistribute super."llsd"; + "llvm" = dontDistribute super."llvm"; + "llvm-analysis" = dontDistribute super."llvm-analysis"; + "llvm-base" = dontDistribute super."llvm-base"; + "llvm-base-types" = dontDistribute super."llvm-base-types"; + "llvm-base-util" = dontDistribute super."llvm-base-util"; + "llvm-data-interop" = dontDistribute super."llvm-data-interop"; + "llvm-extra" = dontDistribute super."llvm-extra"; + "llvm-ffi" = dontDistribute super."llvm-ffi"; + "llvm-general" = dontDistribute super."llvm-general"; + "llvm-general-pure" = dontDistribute super."llvm-general-pure"; + "llvm-general-quote" = dontDistribute super."llvm-general-quote"; + "llvm-ht" = dontDistribute super."llvm-ht"; + "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; + "llvm-pretty" = dontDistribute super."llvm-pretty"; + "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; + "llvm-tf" = dontDistribute super."llvm-tf"; + "llvm-tools" = dontDistribute super."llvm-tools"; + "lmdb" = dontDistribute super."lmdb"; + "load-env" = dontDistribute super."load-env"; + "loadavg" = dontDistribute super."loadavg"; + "local-address" = dontDistribute super."local-address"; + "local-search" = dontDistribute super."local-search"; + "located-base" = dontDistribute super."located-base"; + "locators" = dontDistribute super."locators"; + "loch" = dontDistribute super."loch"; + "lock-file" = dontDistribute super."lock-file"; + "lockfree-queue" = dontDistribute super."lockfree-queue"; + "log" = dontDistribute super."log"; + "log-effect" = dontDistribute super."log-effect"; + "log2json" = dontDistribute super."log2json"; + "logfloat" = dontDistribute super."logfloat"; + "logger" = dontDistribute super."logger"; + "logging" = dontDistribute super."logging"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "lol" = dontDistribute super."lol"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "loop" = doDistribute super."loop_0_2_0"; + "loop-effin" = dontDistribute super."loop-effin"; + "loop-while" = dontDistribute super."loop-while"; + "loops" = dontDistribute super."loops"; + "loopy" = dontDistribute super."loopy"; + "lord" = dontDistribute super."lord"; + "lorem" = dontDistribute super."lorem"; + "loris" = dontDistribute super."loris"; + "loshadka" = dontDistribute super."loshadka"; + "lostcities" = dontDistribute super."lostcities"; + "lowgl" = dontDistribute super."lowgl"; + "ls-usb" = dontDistribute super."ls-usb"; + "lscabal" = dontDistribute super."lscabal"; + "lss" = dontDistribute super."lss"; + "lsystem" = dontDistribute super."lsystem"; + "ltk" = dontDistribute super."ltk"; + "ltl" = dontDistribute super."ltl"; + "lua-bytecode" = dontDistribute super."lua-bytecode"; + "luachunk" = dontDistribute super."luachunk"; + "luautils" = dontDistribute super."luautils"; + "lub" = dontDistribute super."lub"; + "lucid-foundation" = dontDistribute super."lucid-foundation"; + "lucienne" = dontDistribute super."lucienne"; + "luhn" = dontDistribute super."luhn"; + "lui" = dontDistribute super."lui"; + "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; + "lushtags" = dontDistribute super."lushtags"; + "luthor" = dontDistribute super."luthor"; + "lvish" = dontDistribute super."lvish"; + "lvmlib" = dontDistribute super."lvmlib"; + "lvmrun" = dontDistribute super."lvmrun"; + "lxc" = dontDistribute super."lxc"; + "lye" = dontDistribute super."lye"; + "lz4" = dontDistribute super."lz4"; + "lzma" = dontDistribute super."lzma"; + "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-enumerator" = dontDistribute super."lzma-enumerator"; + "lzma-streams" = dontDistribute super."lzma-streams"; + "maam" = dontDistribute super."maam"; + "mac" = dontDistribute super."mac"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-zlib" = dontDistribute super."machines-zlib"; + "macho" = dontDistribute super."macho"; + "maclight" = dontDistribute super."maclight"; + "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; + "mage" = dontDistribute super."mage"; + "magico" = dontDistribute super."magico"; + "magma" = dontDistribute super."magma"; + "mahoro" = dontDistribute super."mahoro"; + "maid" = dontDistribute super."maid"; + "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; + "mailgun" = dontDistribute super."mailgun"; + "majordomo" = dontDistribute super."majordomo"; + "majority" = dontDistribute super."majority"; + "make-hard-links" = dontDistribute super."make-hard-links"; + "make-package" = dontDistribute super."make-package"; + "makedo" = dontDistribute super."makedo"; + "manatee" = dontDistribute super."manatee"; + "manatee-all" = dontDistribute super."manatee-all"; + "manatee-anything" = dontDistribute super."manatee-anything"; + "manatee-browser" = dontDistribute super."manatee-browser"; + "manatee-core" = dontDistribute super."manatee-core"; + "manatee-curl" = dontDistribute super."manatee-curl"; + "manatee-editor" = dontDistribute super."manatee-editor"; + "manatee-filemanager" = dontDistribute super."manatee-filemanager"; + "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; + "manatee-ircclient" = dontDistribute super."manatee-ircclient"; + "manatee-mplayer" = dontDistribute super."manatee-mplayer"; + "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; + "manatee-processmanager" = dontDistribute super."manatee-processmanager"; + "manatee-reader" = dontDistribute super."manatee-reader"; + "manatee-template" = dontDistribute super."manatee-template"; + "manatee-terminal" = dontDistribute super."manatee-terminal"; + "manatee-welcome" = dontDistribute super."manatee-welcome"; + "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_3_0_0"; + "mandulia" = dontDistribute super."mandulia"; + "manifold-random" = dontDistribute super."manifold-random"; + "manifolds" = dontDistribute super."manifolds"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "markdown-unlit" = dontDistribute super."markdown-unlit"; + "markdown2svg" = dontDistribute super."markdown2svg"; + "marked-pretty" = dontDistribute super."marked-pretty"; + "markov" = dontDistribute super."markov"; + "markov-chain" = dontDistribute super."markov-chain"; + "markov-processes" = dontDistribute super."markov-processes"; + "markup" = doDistribute super."markup_1_1_0"; + "markup-preview" = dontDistribute super."markup-preview"; + "marmalade-upload" = dontDistribute super."marmalade-upload"; + "marquise" = dontDistribute super."marquise"; + "marxup" = dontDistribute super."marxup"; + "masakazu-bot" = dontDistribute super."masakazu-bot"; + "mastermind" = dontDistribute super."mastermind"; + "matchers" = dontDistribute super."matchers"; + "mathblog" = dontDistribute super."mathblog"; + "mathgenealogy" = dontDistribute super."mathgenealogy"; + "mathista" = dontDistribute super."mathista"; + "mathlink" = dontDistribute super."mathlink"; + "matlab" = dontDistribute super."matlab"; + "matrix-market" = dontDistribute super."matrix-market"; + "matrix-market-pure" = dontDistribute super."matrix-market-pure"; + "matsuri" = dontDistribute super."matsuri"; + "maude" = dontDistribute super."maude"; + "maxent" = dontDistribute super."maxent"; + "maxsharing" = dontDistribute super."maxsharing"; + "maybe-justify" = dontDistribute super."maybe-justify"; + "maybench" = dontDistribute super."maybench"; + "mbox-tools" = dontDistribute super."mbox-tools"; + "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; + "mcmc-samplers" = dontDistribute super."mcmc-samplers"; + "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; + "mcmc-types" = dontDistribute super."mcmc-types"; + "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mecab" = dontDistribute super."mecab"; + "mecha" = dontDistribute super."mecha"; + "mediawiki" = dontDistribute super."mediawiki"; + "mediawiki2latex" = dontDistribute super."mediawiki2latex"; + "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; + "meep" = dontDistribute super."meep"; + "mega-sdist" = dontDistribute super."mega-sdist"; + "megaparsec" = dontDistribute super."megaparsec"; + "meldable-heap" = dontDistribute super."meldable-heap"; + "melody" = dontDistribute super."melody"; + "memcache" = dontDistribute super."memcache"; + "memcache-conduit" = dontDistribute super."memcache-conduit"; + "memcache-haskell" = dontDistribute super."memcache-haskell"; + "memcached" = dontDistribute super."memcached"; + "memexml" = dontDistribute super."memexml"; + "memo-ptr" = dontDistribute super."memo-ptr"; + "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; + "memory" = doDistribute super."memory_0_7"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messente" = dontDistribute super."messente"; + "meta-misc" = dontDistribute super."meta-misc"; + "meta-par" = dontDistribute super."meta-par"; + "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; + "metadata" = dontDistribute super."metadata"; + "metamorphic" = dontDistribute super."metamorphic"; + "metaplug" = dontDistribute super."metaplug"; + "metric" = dontDistribute super."metric"; + "metricsd-client" = dontDistribute super."metricsd-client"; + "metronome" = dontDistribute super."metronome"; + "mezzolens" = dontDistribute super."mezzolens"; + "mfsolve" = dontDistribute super."mfsolve"; + "mgeneric" = dontDistribute super."mgeneric"; + "mi" = dontDistribute super."mi"; + "microbench" = dontDistribute super."microbench"; + "microformats2-parser" = dontDistribute super."microformats2-parser"; + "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_2_0_0"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0"; + "microlens-platform" = dontDistribute super."microlens-platform"; + "microlens-th" = doDistribute super."microlens-th_0_2_1_1"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midi" = dontDistribute super."midi"; + "midi-alsa" = dontDistribute super."midi-alsa"; + "midi-music-box" = dontDistribute super."midi-music-box"; + "midi-util" = dontDistribute super."midi-util"; + "midimory" = dontDistribute super."midimory"; + "midisurface" = dontDistribute super."midisurface"; + "mighttpd" = dontDistribute super."mighttpd"; + "mighttpd2" = dontDistribute super."mighttpd2"; + "mighty-metropolis" = dontDistribute super."mighty-metropolis"; + "mikmod" = dontDistribute super."mikmod"; + "miku" = dontDistribute super."miku"; + "milena" = dontDistribute super."milena"; + "mime" = dontDistribute super."mime"; + "mime-directory" = dontDistribute super."mime-directory"; + "mime-string" = dontDistribute super."mime-string"; + "mines" = dontDistribute super."mines"; + "minesweeper" = dontDistribute super."minesweeper"; + "miniball" = dontDistribute super."miniball"; + "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; + "minimal-configuration" = dontDistribute super."minimal-configuration"; + "minimorph" = dontDistribute super."minimorph"; + "minimung" = dontDistribute super."minimung"; + "minions" = dontDistribute super."minions"; + "minioperational" = dontDistribute super."minioperational"; + "miniplex" = dontDistribute super."miniplex"; + "minirotate" = dontDistribute super."minirotate"; + "minisat" = dontDistribute super."minisat"; + "ministg" = dontDistribute super."ministg"; + "miniutter" = dontDistribute super."miniutter"; + "minst-idx" = dontDistribute super."minst-idx"; + "mirror-tweet" = dontDistribute super."mirror-tweet"; + "missing-py2" = dontDistribute super."missing-py2"; + "mix-arrows" = dontDistribute super."mix-arrows"; + "mixed-strategies" = dontDistribute super."mixed-strategies"; + "mkbndl" = dontDistribute super."mkbndl"; + "mkcabal" = dontDistribute super."mkcabal"; + "ml-w" = dontDistribute super."ml-w"; + "mlist" = dontDistribute super."mlist"; + "mmtl" = dontDistribute super."mmtl"; + "mmtl-base" = dontDistribute super."mmtl-base"; + "moan" = dontDistribute super."moan"; + "modbus-tcp" = dontDistribute super."modbus-tcp"; + "modelicaparser" = dontDistribute super."modelicaparser"; + "modsplit" = dontDistribute super."modsplit"; + "modular-arithmetic" = dontDistribute super."modular-arithmetic"; + "modular-prelude" = dontDistribute super."modular-prelude"; + "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; + "module-management" = dontDistribute super."module-management"; + "modulespection" = dontDistribute super."modulespection"; + "modulo" = dontDistribute super."modulo"; + "moe" = dontDistribute super."moe"; + "moesocks" = dontDistribute super."moesocks"; + "mohws" = dontDistribute super."mohws"; + "mole" = dontDistribute super."mole"; + "monad-abort-fd" = dontDistribute super."monad-abort-fd"; + "monad-atom" = dontDistribute super."monad-atom"; + "monad-atom-simple" = dontDistribute super."monad-atom-simple"; + "monad-bool" = dontDistribute super."monad-bool"; + "monad-classes" = dontDistribute super."monad-classes"; + "monad-codec" = dontDistribute super."monad-codec"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-interleave" = dontDistribute super."monad-interleave"; + "monad-levels" = dontDistribute super."monad-levels"; + "monad-loops-stm" = dontDistribute super."monad-loops-stm"; + "monad-lrs" = dontDistribute super."monad-lrs"; + "monad-memo" = dontDistribute super."monad-memo"; + "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; + "monad-open" = dontDistribute super."monad-open"; + "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; + "monad-param" = dontDistribute super."monad-param"; + "monad-ran" = dontDistribute super."monad-ran"; + "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-state" = dontDistribute super."monad-state"; + "monad-statevar" = dontDistribute super."monad-statevar"; + "monad-stlike-io" = dontDistribute super."monad-stlike-io"; + "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; + "monad-supply" = dontDistribute super."monad-supply"; + "monad-task" = dontDistribute super."monad-task"; + "monad-time" = dontDistribute super."monad-time"; + "monad-tx" = dontDistribute super."monad-tx"; + "monad-unify" = dontDistribute super."monad-unify"; + "monad-wrap" = dontDistribute super."monad-wrap"; + "monadIO" = dontDistribute super."monadIO"; + "monadLib-compose" = dontDistribute super."monadLib-compose"; + "monadacme" = dontDistribute super."monadacme"; + "monadbi" = dontDistribute super."monadbi"; + "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; + "monadfibre" = dontDistribute super."monadfibre"; + "monadiccp" = dontDistribute super."monadiccp"; + "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; + "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; + "monadlist" = dontDistribute super."monadlist"; + "monadloc" = dontDistribute super."monadloc"; + "monadloc-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mongodb-queue" = dontDistribute super."mongodb-queue"; + "mongrel2-handler" = dontDistribute super."mongrel2-handler"; + "monitor" = dontDistribute super."monitor"; + "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_9_3"; + "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-owns" = dontDistribute super."monoid-owns"; + "monoid-record" = dontDistribute super."monoid-record"; + "monoid-statistics" = dontDistribute super."monoid-statistics"; + "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidplus" = dontDistribute super."monoidplus"; + "monoids" = dontDistribute super."monoids"; + "monomorphic" = dontDistribute super."monomorphic"; + "montage" = dontDistribute super."montage"; + "montage-client" = dontDistribute super."montage-client"; + "monte-carlo" = dontDistribute super."monte-carlo"; + "moo" = dontDistribute super."moo"; + "moonshine" = dontDistribute super."moonshine"; + "morfette" = dontDistribute super."morfette"; + "morfeusz" = dontDistribute super."morfeusz"; + "morte" = dontDistribute super."morte"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "ms" = dontDistribute super."ms"; + "msgpack" = dontDistribute super."msgpack"; + "msgpack-aeson" = dontDistribute super."msgpack-aeson"; + "msgpack-idl" = dontDistribute super."msgpack-idl"; + "msgpack-rpc" = dontDistribute super."msgpack-rpc"; + "msh" = dontDistribute super."msh"; + "msu" = dontDistribute super."msu"; + "mtgoxapi" = dontDistribute super."mtgoxapi"; + "mtl-c" = dontDistribute super."mtl-c"; + "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-tf" = dontDistribute super."mtl-tf"; + "mtl-unleashed" = dontDistribute super."mtl-unleashed"; + "mtlparse" = dontDistribute super."mtlparse"; + "mtlx" = dontDistribute super."mtlx"; + "mtp" = dontDistribute super."mtp"; + "mtree" = dontDistribute super."mtree"; + "mucipher" = dontDistribute super."mucipher"; + "mudbath" = dontDistribute super."mudbath"; + "muesli" = dontDistribute super."muesli"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "multiplate" = dontDistribute super."multiplate"; + "multiplate-simplified" = dontDistribute super."multiplate-simplified"; + "multiplicity" = dontDistribute super."multiplicity"; + "multirec" = dontDistribute super."multirec"; + "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; + "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset-comb" = dontDistribute super."multiset-comb"; + "multisetrewrite" = dontDistribute super."multisetrewrite"; + "multistate" = dontDistribute super."multistate"; + "muon" = dontDistribute super."muon"; + "murder" = dontDistribute super."murder"; + "murmur3" = dontDistribute super."murmur3"; + "murmurhash3" = dontDistribute super."murmurhash3"; + "music-articulation" = dontDistribute super."music-articulation"; + "music-diatonic" = dontDistribute super."music-diatonic"; + "music-dynamics" = dontDistribute super."music-dynamics"; + "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; + "music-graphics" = dontDistribute super."music-graphics"; + "music-parts" = dontDistribute super."music-parts"; + "music-pitch" = dontDistribute super."music-pitch"; + "music-pitch-literal" = dontDistribute super."music-pitch-literal"; + "music-preludes" = dontDistribute super."music-preludes"; + "music-score" = dontDistribute super."music-score"; + "music-sibelius" = dontDistribute super."music-sibelius"; + "music-suite" = dontDistribute super."music-suite"; + "music-util" = dontDistribute super."music-util"; + "musicbrainz-email" = dontDistribute super."musicbrainz-email"; + "musicxml" = dontDistribute super."musicxml"; + "musicxml2" = dontDistribute super."musicxml2"; + "mustache" = dontDistribute super."mustache"; + "mustache-haskell" = dontDistribute super."mustache-haskell"; + "mustache2hs" = dontDistribute super."mustache2hs"; + "mutable-iter" = dontDistribute super."mutable-iter"; + "mute-unmute" = dontDistribute super."mute-unmute"; + "mvc" = dontDistribute super."mvc"; + "mvc-updates" = dontDistribute super."mvc-updates"; + "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = dontDistribute super."mwc-probability"; + "mwc-random-monad" = dontDistribute super."mwc-random-monad"; + "myTestlll" = dontDistribute super."myTestlll"; + "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; + "myo" = dontDistribute super."myo"; + "mysnapsession" = dontDistribute super."mysnapsession"; + "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; + "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mzv" = dontDistribute super."mzv"; + "n-m" = dontDistribute super."n-m"; + "nagios-check" = dontDistribute super."nagios-check"; + "nagios-perfdata" = dontDistribute super."nagios-perfdata"; + "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; + "named-formlet" = dontDistribute super."named-formlet"; + "named-lock" = dontDistribute super."named-lock"; + "named-records" = dontDistribute super."named-records"; + "namelist" = dontDistribute super."namelist"; + "names" = dontDistribute super."names"; + "names-th" = dontDistribute super."names-th"; + "nano-cryptr" = dontDistribute super."nano-cryptr"; + "nano-hmac" = dontDistribute super."nano-hmac"; + "nano-md5" = dontDistribute super."nano-md5"; + "nanoAgda" = dontDistribute super."nanoAgda"; + "nanocurses" = dontDistribute super."nanocurses"; + "nanomsg" = dontDistribute super."nanomsg"; + "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; + "nanoparsec" = dontDistribute super."nanoparsec"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "nats" = doDistribute super."nats_1"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "natural-sort" = dontDistribute super."natural-sort"; + "natural-transformation" = dontDistribute super."natural-transformation"; + "naturalcomp" = dontDistribute super."naturalcomp"; + "naturals" = dontDistribute super."naturals"; + "naver-translate" = dontDistribute super."naver-translate"; + "nbt" = dontDistribute super."nbt"; + "nc-indicators" = dontDistribute super."nc-indicators"; + "ncurses" = dontDistribute super."ncurses"; + "neat" = dontDistribute super."neat"; + "needle" = dontDistribute super."needle"; + "neet" = dontDistribute super."neet"; + "nehe-tuts" = dontDistribute super."nehe-tuts"; + "neil" = dontDistribute super."neil"; + "neither" = dontDistribute super."neither"; + "nemesis" = dontDistribute super."nemesis"; + "nemesis-titan" = dontDistribute super."nemesis-titan"; + "nerf" = dontDistribute super."nerf"; + "nero" = dontDistribute super."nero"; + "nero-wai" = dontDistribute super."nero-wai"; + "nero-warp" = dontDistribute super."nero-warp"; + "nested-routes" = dontDistribute super."nested-routes"; + "nested-sets" = dontDistribute super."nested-sets"; + "nestedmap" = dontDistribute super."nestedmap"; + "net-concurrent" = dontDistribute super."net-concurrent"; + "netclock" = dontDistribute super."netclock"; + "netcore" = dontDistribute super."netcore"; + "netlines" = dontDistribute super."netlines"; + "netlink" = dontDistribute super."netlink"; + "netlist" = dontDistribute super."netlist"; + "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; + "netpbm" = dontDistribute super."netpbm"; + "netrc" = dontDistribute super."netrc"; + "netspec" = dontDistribute super."netspec"; + "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = dontDistribute super."nettle"; + "nettle-frp" = dontDistribute super."nettle-frp"; + "nettle-netkit" = dontDistribute super."nettle-netkit"; + "nettle-openflow" = dontDistribute super."nettle-openflow"; + "netwire" = dontDistribute super."netwire"; + "netwire-input" = dontDistribute super."netwire-input"; + "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network-address" = dontDistribute super."network-address"; + "network-anonymous-tor" = doDistribute super."network-anonymous-tor_0_9_2"; + "network-api-support" = dontDistribute super."network-api-support"; + "network-bitcoin" = dontDistribute super."network-bitcoin"; + "network-builder" = dontDistribute super."network-builder"; + "network-bytestring" = dontDistribute super."network-bytestring"; + "network-conduit" = dontDistribute super."network-conduit"; + "network-connection" = dontDistribute super."network-connection"; + "network-data" = dontDistribute super."network-data"; + "network-dbus" = dontDistribute super."network-dbus"; + "network-dns" = dontDistribute super."network-dns"; + "network-enumerator" = dontDistribute super."network-enumerator"; + "network-fancy" = dontDistribute super."network-fancy"; + "network-house" = dontDistribute super."network-house"; + "network-interfacerequest" = dontDistribute super."network-interfacerequest"; + "network-ip" = dontDistribute super."network-ip"; + "network-metrics" = dontDistribute super."network-metrics"; + "network-minihttp" = dontDistribute super."network-minihttp"; + "network-msg" = dontDistribute super."network-msg"; + "network-netpacket" = dontDistribute super."network-netpacket"; + "network-pgi" = dontDistribute super."network-pgi"; + "network-rpca" = dontDistribute super."network-rpca"; + "network-server" = dontDistribute super."network-server"; + "network-service" = dontDistribute super."network-service"; + "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; + "network-simple-tls" = dontDistribute super."network-simple-tls"; + "network-socket-options" = dontDistribute super."network-socket-options"; + "network-stream" = dontDistribute super."network-stream"; + "network-topic-models" = dontDistribute super."network-topic-models"; + "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-transport-composed" = dontDistribute super."network-transport-composed"; + "network-transport-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-transport-tcp" = dontDistribute super."network-transport-tcp"; + "network-transport-tests" = dontDistribute super."network-transport-tests"; + "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicify-lib" = dontDistribute super."nicify-lib"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = dontDistribute super."nix-paths"; + "nixfromnpm" = dontDistribute super."nixfromnpm"; + "nixos-types" = dontDistribute super."nixos-types"; + "nkjp" = dontDistribute super."nkjp"; + "nlp-scores" = dontDistribute super."nlp-scores"; + "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; + "nm" = dontDistribute super."nm"; + "nme" = dontDistribute super."nme"; + "nntp" = dontDistribute super."nntp"; + "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; + "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyze" = dontDistribute super."nofib-analyze"; + "noise" = dontDistribute super."noise"; + "non-empty" = dontDistribute super."non-empty"; + "non-negative" = dontDistribute super."non-negative"; + "nondeterminism" = dontDistribute super."nondeterminism"; + "nonfree" = dontDistribute super."nonfree"; + "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; + "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; + "noodle" = dontDistribute super."noodle"; + "normaldistribution" = dontDistribute super."normaldistribution"; + "not-gloss" = dontDistribute super."not-gloss"; + "not-gloss-examples" = dontDistribute super."not-gloss-examples"; + "not-in-base" = dontDistribute super."not-in-base"; + "notcpp" = dontDistribute super."notcpp"; + "notmuch-haskell" = dontDistribute super."notmuch-haskell"; + "notmuch-web" = dontDistribute super."notmuch-web"; + "notzero" = dontDistribute super."notzero"; + "np-extras" = dontDistribute super."np-extras"; + "np-linear" = dontDistribute super."np-linear"; + "nptools" = dontDistribute super."nptools"; + "nth-prime" = dontDistribute super."nth-prime"; + "nthable" = dontDistribute super."nthable"; + "ntp-control" = dontDistribute super."ntp-control"; + "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; + "number" = dontDistribute super."number"; + "numbering" = dontDistribute super."numbering"; + "numerals" = dontDistribute super."numerals"; + "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; + "numeric-limits" = dontDistribute super."numeric-limits"; + "numeric-prelude" = dontDistribute super."numeric-prelude"; + "numeric-qq" = dontDistribute super."numeric-qq"; + "numeric-quest" = dontDistribute super."numeric-quest"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype-dk" = dontDistribute super."numtype-dk"; + "numtype-tf" = dontDistribute super."numtype-tf"; + "nurbs" = dontDistribute super."nurbs"; + "nvim-hs" = dontDistribute super."nvim-hs"; + "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; + "nyan" = dontDistribute super."nyan"; + "nylas" = dontDistribute super."nylas"; + "nymphaea" = dontDistribute super."nymphaea"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "off-simple" = dontDistribute super."off-simple"; + "ofx" = dontDistribute super."ofx"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "oidc-client" = dontDistribute super."oidc-client"; + "ois-input-manager" = dontDistribute super."ois-input-manager"; + "old-version" = dontDistribute super."old-version"; + "olwrapper" = dontDistribute super."olwrapper"; + "omaketex" = dontDistribute super."omaketex"; + "omega" = dontDistribute super."omega"; + "omnicodec" = dontDistribute super."omnicodec"; + "on-a-horse" = dontDistribute super."on-a-horse"; + "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; + "one-liner" = dontDistribute super."one-liner"; + "one-time-password" = dontDistribute super."one-time-password"; + "oneOfN" = dontDistribute super."oneOfN"; + "oneormore" = dontDistribute super."oneormore"; + "only" = dontDistribute super."only"; + "onu-course" = dontDistribute super."onu-course"; + "oo-prototypes" = dontDistribute super."oo-prototypes"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; + "open-browser" = dontDistribute super."open-browser"; + "open-haddock" = dontDistribute super."open-haddock"; + "open-pandoc" = dontDistribute super."open-pandoc"; + "open-symbology" = dontDistribute super."open-symbology"; + "open-typerep" = dontDistribute super."open-typerep"; + "open-union" = dontDistribute super."open-union"; + "open-witness" = dontDistribute super."open-witness"; + "opencv-raw" = dontDistribute super."opencv-raw"; + "opendatatable" = dontDistribute super."opendatatable"; + "openexchangerates" = dontDistribute super."openexchangerates"; + "openflow" = dontDistribute super."openflow"; + "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; + "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; + "opengles" = dontDistribute super."opengles"; + "openid" = dontDistribute super."openid"; + "openpgp" = dontDistribute super."openpgp"; + "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; + "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; + "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; + "openssh-github-keys" = dontDistribute super."openssh-github-keys"; + "openssl-createkey" = dontDistribute super."openssl-createkey"; + "opentheory" = dontDistribute super."opentheory"; + "opentheory-bits" = dontDistribute super."opentheory-bits"; + "opentheory-byte" = dontDistribute super."opentheory-byte"; + "opentheory-char" = dontDistribute super."opentheory-char"; + "opentheory-divides" = dontDistribute super."opentheory-divides"; + "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; + "opentheory-parser" = dontDistribute super."opentheory-parser"; + "opentheory-prime" = dontDistribute super."opentheory-prime"; + "opentheory-primitive" = dontDistribute super."opentheory-primitive"; + "opentheory-probability" = dontDistribute super."opentheory-probability"; + "opentheory-stream" = dontDistribute super."opentheory-stream"; + "opentheory-unicode" = dontDistribute super."opentheory-unicode"; + "operational-alacarte" = dontDistribute super."operational-alacarte"; + "opml" = dontDistribute super."opml"; + "opml-conduit" = dontDistribute super."opml-conduit"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "orc" = dontDistribute super."orc"; + "orchestrate" = dontDistribute super."orchestrate"; + "orchid" = dontDistribute super."orchid"; + "orchid-demo" = dontDistribute super."orchid-demo"; + "ord-adhoc" = dontDistribute super."ord-adhoc"; + "order-maintenance" = dontDistribute super."order-maintenance"; + "order-statistics" = dontDistribute super."order-statistics"; + "ordered" = dontDistribute super."ordered"; + "orders" = dontDistribute super."orders"; + "ordrea" = dontDistribute super."ordrea"; + "organize-imports" = dontDistribute super."organize-imports"; + "orgmode" = dontDistribute super."orgmode"; + "orgmode-parse" = dontDistribute super."orgmode-parse"; + "origami" = dontDistribute super."origami"; + "os-release" = dontDistribute super."os-release"; + "osc" = dontDistribute super."osc"; + "osm-download" = dontDistribute super."osm-download"; + "oso2pdf" = dontDistribute super."oso2pdf"; + "osx-ar" = dontDistribute super."osx-ar"; + "ot" = dontDistribute super."ot"; + "ottparse-pretty" = dontDistribute super."ottparse-pretty"; + "overture" = dontDistribute super."overture"; + "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; + "package-o-tron" = dontDistribute super."package-o-tron"; + "package-vt" = dontDistribute super."package-vt"; + "packdeps" = dontDistribute super."packdeps"; + "packed-dawg" = dontDistribute super."packed-dawg"; + "packedstring" = dontDistribute super."packedstring"; + "packer" = dontDistribute super."packer"; + "packunused" = dontDistribute super."packunused"; + "pacman-memcache" = dontDistribute super."pacman-memcache"; + "padKONTROL" = dontDistribute super."padKONTROL"; + "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = doDistribute super."pagerduty_0_0_3_3"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4"; + "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; + "pandoc-crossref" = dontDistribute super."pandoc-crossref"; + "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-lens" = dontDistribute super."pandoc-lens"; + "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "papillon" = dontDistribute super."papillon"; + "pappy" = dontDistribute super."pappy"; + "para" = dontDistribute super."para"; + "paragon" = dontDistribute super."paragon"; + "parallel-tasks" = dontDistribute super."parallel-tasks"; + "parallel-tree-search" = dontDistribute super."parallel-tree-search"; + "parameterized-data" = dontDistribute super."parameterized-data"; + "parco" = dontDistribute super."parco"; + "parco-attoparsec" = dontDistribute super."parco-attoparsec"; + "parco-parsec" = dontDistribute super."parco-parsec"; + "parcom-lib" = dontDistribute super."parcom-lib"; + "parconc-examples" = dontDistribute super."parconc-examples"; + "parport" = dontDistribute super."parport"; + "parse-dimacs" = dontDistribute super."parse-dimacs"; + "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; + "parsec-extra" = dontDistribute super."parsec-extra"; + "parsec-numbers" = dontDistribute super."parsec-numbers"; + "parsec-parsers" = dontDistribute super."parsec-parsers"; + "parsec-permutation" = dontDistribute super."parsec-permutation"; + "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; + "parsec-trace" = dontDistribute super."parsec-trace"; + "parsec-utils" = dontDistribute super."parsec-utils"; + "parsec1" = dontDistribute super."parsec1"; + "parsec2" = dontDistribute super."parsec2"; + "parsec3" = dontDistribute super."parsec3"; + "parsec3-numbers" = dontDistribute super."parsec3-numbers"; + "parsedate" = dontDistribute super."parsedate"; + "parseerror-eq" = dontDistribute super."parseerror-eq"; + "parsek" = dontDistribute super."parsek"; + "parsely" = dontDistribute super."parsely"; + "parser-helper" = dontDistribute super."parser-helper"; + "parser241" = dontDistribute super."parser241"; + "parsergen" = dontDistribute super."parsergen"; + "parsestar" = dontDistribute super."parsestar"; + "parsimony" = dontDistribute super."parsimony"; + "partial" = dontDistribute super."partial"; + "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; + "partial-lens" = dontDistribute super."partial-lens"; + "partial-uri" = dontDistribute super."partial-uri"; + "partly" = dontDistribute super."partly"; + "passage" = dontDistribute super."passage"; + "passwords" = dontDistribute super."passwords"; + "pastis" = dontDistribute super."pastis"; + "pasty" = dontDistribute super."pasty"; + "patch-combinators" = dontDistribute super."patch-combinators"; + "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; + "path-extra" = dontDistribute super."path-extra"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "pathwalk" = dontDistribute super."pathwalk"; + "patronscraper" = dontDistribute super."patronscraper"; + "patterns" = dontDistribute super."patterns"; + "paymill" = dontDistribute super."paymill"; + "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; + "paypal-api" = dontDistribute super."paypal-api"; + "pb" = dontDistribute super."pb"; + "pbc4hs" = dontDistribute super."pbc4hs"; + "pbkdf" = dontDistribute super."pbkdf"; + "pcap" = dontDistribute super."pcap"; + "pcap-conduit" = dontDistribute super."pcap-conduit"; + "pcap-enumerator" = dontDistribute super."pcap-enumerator"; + "pcd-loader" = dontDistribute super."pcd-loader"; + "pcf" = dontDistribute super."pcf"; + "pcg-random" = dontDistribute super."pcg-random"; + "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; + "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pcre-utils" = dontDistribute super."pcre-utils"; + "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; + "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core"; + "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document"; + "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; + "pdf2line" = dontDistribute super."pdf2line"; + "pdfsplit" = dontDistribute super."pdfsplit"; + "pdynload" = dontDistribute super."pdynload"; + "peakachu" = dontDistribute super."peakachu"; + "peano" = dontDistribute super."peano"; + "peano-inf" = dontDistribute super."peano-inf"; + "pec" = dontDistribute super."pec"; + "pecoff" = dontDistribute super."pecoff"; + "peg" = dontDistribute super."peg"; + "peggy" = dontDistribute super."peggy"; + "pell" = dontDistribute super."pell"; + "penn-treebank" = dontDistribute super."penn-treebank"; + "penny" = dontDistribute super."penny"; + "penny-bin" = dontDistribute super."penny-bin"; + "penny-lib" = dontDistribute super."penny-lib"; + "peparser" = dontDistribute super."peparser"; + "perceptron" = dontDistribute super."perceptron"; + "perdure" = dontDistribute super."perdure"; + "period" = dontDistribute super."period"; + "perm" = dontDistribute super."perm"; + "permutation" = dontDistribute super."permutation"; + "permute" = dontDistribute super."permute"; + "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = dontDistribute super."persistable-record"; + "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg"; + "persistent-cereal" = dontDistribute super."persistent-cereal"; + "persistent-equivalence" = dontDistribute super."persistent-equivalence"; + "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; + "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-map" = dontDistribute super."persistent-map"; + "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; + "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-protobuf" = dontDistribute super."persistent-protobuf"; + "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; + "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-vector" = dontDistribute super."persistent-vector"; + "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; + "persona" = dontDistribute super."persona"; + "persona-idp" = dontDistribute super."persona-idp"; + "pesca" = dontDistribute super."pesca"; + "peyotls" = dontDistribute super."peyotls"; + "peyotls-codec" = dontDistribute super."peyotls-codec"; + "pez" = dontDistribute super."pez"; + "pg-harness" = dontDistribute super."pg-harness"; + "pg-harness-client" = dontDistribute super."pg-harness-client"; + "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pgdl" = dontDistribute super."pgdl"; + "pgm" = dontDistribute super."pgm"; + "pgp-wordlist" = dontDistribute super."pgp-wordlist"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phizzle" = dontDistribute super."phizzle"; + "phone-numbers" = dontDistribute super."phone-numbers"; + "phone-push" = dontDistribute super."phone-push"; + "phonetic-code" = dontDistribute super."phonetic-code"; + "phooey" = dontDistribute super."phooey"; + "photoname" = dontDistribute super."photoname"; + "phraskell" = dontDistribute super."phraskell"; + "phybin" = dontDistribute super."phybin"; + "pi-calculus" = dontDistribute super."pi-calculus"; + "pia-forward" = dontDistribute super."pia-forward"; + "pianola" = dontDistribute super."pianola"; + "picologic" = dontDistribute super."picologic"; + "picosat" = dontDistribute super."picosat"; + "piet" = dontDistribute super."piet"; + "piki" = dontDistribute super."piki"; + "pinboard" = dontDistribute super."pinboard"; + "pinch" = dontDistribute super."pinch"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-cacophony" = dontDistribute super."pipes-cacophony"; + "pipes-cellular" = dontDistribute super."pipes-cellular"; + "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; + "pipes-cereal" = dontDistribute super."pipes-cereal"; + "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-conduit" = dontDistribute super."pipes-conduit"; + "pipes-core" = dontDistribute super."pipes-core"; + "pipes-courier" = dontDistribute super."pipes-courier"; + "pipes-csv" = dontDistribute super."pipes-csv"; + "pipes-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-extras" = dontDistribute super."pipes-extras"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-mongodb" = dontDistribute super."pipes-mongodb"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pitchtrack" = dontDistribute super."pitchtrack"; + "pivotal-tracker" = dontDistribute super."pivotal-tracker"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plivo" = dontDistribute super."plivo"; + "plot" = doDistribute super."plot_0_2_3_4"; + "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; + "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; + "plot-gtk3" = doDistribute super."plot-gtk3_0_1_0_1"; + "plot-lab" = dontDistribute super."plot-lab"; + "plotfont" = dontDistribute super."plotfont"; + "plotserver-api" = dontDistribute super."plotserver-api"; + "plugins" = dontDistribute super."plugins"; + "plugins-auto" = dontDistribute super."plugins-auto"; + "plugins-multistage" = dontDistribute super."plugins-multistage"; + "plumbers" = dontDistribute super."plumbers"; + "ply-loader" = dontDistribute super."ply-loader"; + "png-file" = dontDistribute super."png-file"; + "pngload" = dontDistribute super."pngload"; + "pngload-fixed" = dontDistribute super."pngload-fixed"; + "pnm" = dontDistribute super."pnm"; + "pocket-dns" = dontDistribute super."pocket-dns"; + "pointedlist" = dontDistribute super."pointedlist"; + "pointfree" = dontDistribute super."pointfree"; + "pointful" = dontDistribute super."pointful"; + "pointless-fun" = dontDistribute super."pointless-fun"; + "pointless-haskell" = dontDistribute super."pointless-haskell"; + "pointless-lenses" = dontDistribute super."pointless-lenses"; + "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "poker-eval" = dontDistribute super."poker-eval"; + "pokitdok" = dontDistribute super."pokitdok"; + "polar" = dontDistribute super."polar"; + "polar-configfile" = dontDistribute super."polar-configfile"; + "polar-shader" = dontDistribute super."polar-shader"; + "polh-lexicon" = dontDistribute super."polh-lexicon"; + "polimorf" = dontDistribute super."polimorf"; + "poll" = dontDistribute super."poll"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; + "polynomial" = dontDistribute super."polynomial"; + "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; + "polyseq" = dontDistribute super."polyseq"; + "polysoup" = dontDistribute super."polysoup"; + "polytypeable" = dontDistribute super."polytypeable"; + "polytypeable-utils" = dontDistribute super."polytypeable-utils"; + "ponder" = dontDistribute super."ponder"; + "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; + "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; + "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; + "pony" = dontDistribute super."pony"; + "pool" = dontDistribute super."pool"; + "pool-conduit" = dontDistribute super."pool-conduit"; + "pooled-io" = dontDistribute super."pooled-io"; + "pop3-client" = dontDistribute super."pop3-client"; + "popenhs" = dontDistribute super."popenhs"; + "poppler" = dontDistribute super."poppler"; + "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; + "portable-lines" = dontDistribute super."portable-lines"; + "portaudio" = dontDistribute super."portaudio"; + "porte" = dontDistribute super."porte"; + "porter" = dontDistribute super."porter"; + "ports" = dontDistribute super."ports"; + "ports-tools" = dontDistribute super."ports-tools"; + "positive" = dontDistribute super."positive"; + "posix-acl" = dontDistribute super."posix-acl"; + "posix-escape" = dontDistribute super."posix-escape"; + "posix-filelock" = dontDistribute super."posix-filelock"; + "posix-paths" = dontDistribute super."posix-paths"; + "posix-pty" = dontDistribute super."posix-pty"; + "posix-timer" = dontDistribute super."posix-timer"; + "posix-waitpid" = dontDistribute super."posix-waitpid"; + "possible" = dontDistribute super."possible"; + "post-mess-age" = doDistribute super."post-mess-age_0_1_0_0"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-config" = dontDistribute super."postgresql-config"; + "postgresql-connector" = dontDistribute super."postgresql-connector"; + "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; + "postgresql-cube" = dontDistribute super."postgresql-cube"; + "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; + "postgresql-orm" = dontDistribute super."postgresql-orm"; + "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; + "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; + "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; + "postgresql-typed" = dontDistribute super."postgresql-typed"; + "postgrest" = dontDistribute super."postgrest"; + "postie" = dontDistribute super."postie"; + "postmark" = dontDistribute super."postmark"; + "postmaster" = dontDistribute super."postmaster"; + "potato-tool" = dontDistribute super."potato-tool"; + "potrace" = dontDistribute super."potrace"; + "potrace-diagrams" = dontDistribute super."potrace-diagrams"; + "powermate" = dontDistribute super."powermate"; + "powerpc" = dontDistribute super."powerpc"; + "ppm" = dontDistribute super."ppm"; + "pqc" = dontDistribute super."pqc"; + "pqueue-mtl" = dontDistribute super."pqueue-mtl"; + "practice-room" = dontDistribute super."practice-room"; + "precis" = dontDistribute super."precis"; + "pred-trie" = doDistribute super."pred-trie_0_2_0"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "prefix-units" = doDistribute super."prefix-units_0_1_0_2"; + "prefork" = dontDistribute super."prefork"; + "pregame" = dontDistribute super."pregame"; + "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-generalize" = dontDistribute super."prelude-generalize"; + "prelude-plus" = dontDistribute super."prelude-plus"; + "prelude-prime" = dontDistribute super."prelude-prime"; + "prelude-safeenum" = dontDistribute super."prelude-safeenum"; + "preprocess-haskell" = dontDistribute super."preprocess-haskell"; + "preprocessor-tools" = dontDistribute super."preprocessor-tools"; + "present" = dontDistribute super."present"; + "press" = dontDistribute super."press"; + "presto-hdbc" = dontDistribute super."presto-hdbc"; + "prettify" = dontDistribute super."prettify"; + "pretty-compact" = dontDistribute super."pretty-compact"; + "pretty-error" = dontDistribute super."pretty-error"; + "pretty-hex" = dontDistribute super."pretty-hex"; + "pretty-ncols" = dontDistribute super."pretty-ncols"; + "pretty-sop" = dontDistribute super."pretty-sop"; + "pretty-tree" = dontDistribute super."pretty-tree"; + "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; + "prim-uniq" = dontDistribute super."prim-uniq"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printxosd" = dontDistribute super."printxosd"; + "priority-queue" = dontDistribute super."priority-queue"; + "priority-sync" = dontDistribute super."priority-sync"; + "privileged-concurrency" = dontDistribute super."privileged-concurrency"; + "prizm" = dontDistribute super."prizm"; + "probability" = dontDistribute super."probability"; + "probable" = dontDistribute super."probable"; + "proc" = dontDistribute super."proc"; + "process-conduit" = dontDistribute super."process-conduit"; + "process-iterio" = dontDistribute super."process-iterio"; + "process-leksah" = dontDistribute super."process-leksah"; + "process-listlike" = dontDistribute super."process-listlike"; + "process-progress" = dontDistribute super."process-progress"; + "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; + "processing" = dontDistribute super."processing"; + "processor-creative-kit" = dontDistribute super."processor-creative-kit"; + "procrastinating-structure" = dontDistribute super."procrastinating-structure"; + "procrastinating-variable" = dontDistribute super."procrastinating-variable"; + "procstat" = dontDistribute super."procstat"; + "proctest" = dontDistribute super."proctest"; + "prof2dot" = dontDistribute super."prof2dot"; + "prof2pretty" = dontDistribute super."prof2pretty"; + "profiteur" = dontDistribute super."profiteur"; + "progress" = dontDistribute super."progress"; + "progressbar" = dontDistribute super."progressbar"; + "progression" = dontDistribute super."progression"; + "progressive" = dontDistribute super."progressive"; + "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; + "projection" = dontDistribute super."projection"; + "prolog" = dontDistribute super."prolog"; + "prolog-graph" = dontDistribute super."prolog-graph"; + "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; + "prologue" = dontDistribute super."prologue"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "prompt" = dontDistribute super."prompt"; + "propane" = dontDistribute super."propane"; + "propellor" = dontDistribute super."propellor"; + "properties" = dontDistribute super."properties"; + "property-list" = dontDistribute super."property-list"; + "proplang" = dontDistribute super."proplang"; + "props" = dontDistribute super."props"; + "prosper" = dontDistribute super."prosper"; + "proteaaudio" = dontDistribute super."proteaaudio"; + "protobuf" = dontDistribute super."protobuf"; + "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = dontDistribute super."psc-ide"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = dontDistribute super."publicsuffix"; + "publicsuffixlist" = dontDistribute super."publicsuffixlist"; + "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; + "pubnub" = dontDistribute super."pubnub"; + "pubsub" = dontDistribute super."pubsub"; + "puffytools" = dontDistribute super."puffytools"; + "pugixml" = dontDistribute super."pugixml"; + "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; + "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; + "pugs-compat" = dontDistribute super."pugs-compat"; + "pugs-hsregex" = dontDistribute super."pugs-hsregex"; + "pulse-simple" = dontDistribute super."pulse-simple"; + "punkt" = dontDistribute super."punkt"; + "punycode" = dontDistribute super."punycode"; + "puppetresources" = dontDistribute super."puppetresources"; + "pure-cdb" = dontDistribute super."pure-cdb"; + "pure-fft" = dontDistribute super."pure-fft"; + "pure-priority-queue" = dontDistribute super."pure-priority-queue"; + "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; + "pure-zlib" = dontDistribute super."pure-zlib"; + "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; + "push-notify" = dontDistribute super."push-notify"; + "push-notify-ccs" = dontDistribute super."push-notify-ccs"; + "push-notify-general" = dontDistribute super."push-notify-general"; + "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; + "pushme" = dontDistribute super."pushme"; + "putlenses" = dontDistribute super."putlenses"; + "puzzle-draw" = dontDistribute super."puzzle-draw"; + "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; + "pvd" = dontDistribute super."pvd"; + "pwstore-cli" = dontDistribute super."pwstore-cli"; + "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell"; + "pxsl-tools" = dontDistribute super."pxsl-tools"; + "pyffi" = dontDistribute super."pyffi"; + "pyfi" = dontDistribute super."pyfi"; + "python-pickle" = dontDistribute super."python-pickle"; + "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; + "qd" = dontDistribute super."qd"; + "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; + "qhull-simple" = dontDistribute super."qhull-simple"; + "qrcode" = dontDistribute super."qrcode"; + "qt" = dontDistribute super."qt"; + "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quantfin" = dontDistribute super."quantfin"; + "quantities" = dontDistribute super."quantities"; + "quantum-arrow" = dontDistribute super."quantum-arrow"; + "qudb" = dontDistribute super."qudb"; + "quenya-verb" = dontDistribute super."quenya-verb"; + "querystring-pickle" = dontDistribute super."querystring-pickle"; + "questioner" = dontDistribute super."questioner"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-poly" = dontDistribute super."quickcheck-poly"; + "quickcheck-properties" = dontDistribute super."quickcheck-properties"; + "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; + "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; + "quickcheck-regex" = dontDistribute super."quickcheck-regex"; + "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; + "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; + "quickcheck-script" = dontDistribute super."quickcheck-script"; + "quickcheck-simple" = dontDistribute super."quickcheck-simple"; + "quickcheck-text" = dontDistribute super."quickcheck-text"; + "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; + "quicklz" = dontDistribute super."quicklz"; + "quickpull" = dontDistribute super."quickpull"; + "quickset" = dontDistribute super."quickset"; + "quickspec" = dontDistribute super."quickspec"; + "quicktest" = dontDistribute super."quicktest"; + "quickwebapp" = dontDistribute super."quickwebapp"; + "quiver" = dontDistribute super."quiver"; + "quiver-bytestring" = dontDistribute super."quiver-bytestring"; + "quiver-cell" = dontDistribute super."quiver-cell"; + "quiver-csv" = dontDistribute super."quiver-csv"; + "quiver-enumerator" = dontDistribute super."quiver-enumerator"; + "quiver-http" = dontDistribute super."quiver-http"; + "quoridor-hs" = dontDistribute super."quoridor-hs"; + "qux" = dontDistribute super."qux"; + "rabocsv2qif" = dontDistribute super."rabocsv2qif"; + "rad" = dontDistribute super."rad"; + "radian" = dontDistribute super."radian"; + "radium" = dontDistribute super."radium"; + "radium-formula-parser" = dontDistribute super."radium-formula-parser"; + "radix" = dontDistribute super."radix"; + "rados-haskell" = dontDistribute super."rados-haskell"; + "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rake" = dontDistribute super."rake"; + "rakhana" = dontDistribute super."rakhana"; + "ralist" = dontDistribute super."ralist"; + "rallod" = dontDistribute super."rallod"; + "raml" = dontDistribute super."raml"; + "rand-vars" = dontDistribute super."rand-vars"; + "randfile" = dontDistribute super."randfile"; + "random-access-list" = dontDistribute super."random-access-list"; + "random-derive" = dontDistribute super."random-derive"; + "random-eff" = dontDistribute super."random-eff"; + "random-effin" = dontDistribute super."random-effin"; + "random-extras" = dontDistribute super."random-extras"; + "random-hypergeometric" = dontDistribute super."random-hypergeometric"; + "random-stream" = dontDistribute super."random-stream"; + "random-variates" = dontDistribute super."random-variates"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-set-list" = dontDistribute super."range-set-list"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rank1dynamic" = dontDistribute super."rank1dynamic"; + "rascal" = dontDistribute super."rascal"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratio-int" = dontDistribute super."ratio-int"; + "raven-haskell" = dontDistribute super."raven-haskell"; + "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "rawstring-qm" = dontDistribute super."rawstring-qm"; + "razom-text-util" = dontDistribute super."razom-text-util"; + "rbr" = dontDistribute super."rbr"; + "rclient" = dontDistribute super."rclient"; + "rcu" = dontDistribute super."rcu"; + "rdf4h" = dontDistribute super."rdf4h"; + "rdioh" = dontDistribute super."rdioh"; + "rdtsc" = dontDistribute super."rdtsc"; + "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; + "re2" = dontDistribute super."re2"; + "react-flux" = dontDistribute super."react-flux"; + "react-haskell" = dontDistribute super."react-haskell"; + "reaction-logic" = dontDistribute super."reaction-logic"; + "reactive" = dontDistribute super."reactive"; + "reactive-bacon" = dontDistribute super."reactive-bacon"; + "reactive-balsa" = dontDistribute super."reactive-balsa"; + "reactive-banana" = dontDistribute super."reactive-banana"; + "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; + "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; + "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; + "reactive-glut" = dontDistribute super."reactive-glut"; + "reactive-haskell" = dontDistribute super."reactive-haskell"; + "reactive-io" = dontDistribute super."reactive-io"; + "reactive-thread" = dontDistribute super."reactive-thread"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "read-editor" = dontDistribute super."read-editor"; + "readable" = dontDistribute super."readable"; + "readline" = dontDistribute super."readline"; + "readline-statevar" = dontDistribute super."readline-statevar"; + "readpyc" = dontDistribute super."readpyc"; + "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; + "reasonable-lens" = dontDistribute super."reasonable-lens"; + "reasonable-operational" = dontDistribute super."reasonable-operational"; + "recaptcha" = dontDistribute super."recaptcha"; + "record" = dontDistribute super."record"; + "record-aeson" = dontDistribute super."record-aeson"; + "record-gl" = dontDistribute super."record-gl"; + "record-preprocessor" = dontDistribute super."record-preprocessor"; + "record-syntax" = dontDistribute super."record-syntax"; + "records" = dontDistribute super."records"; + "records-th" = dontDistribute super."records-th"; + "recursion-schemes" = dontDistribute super."recursion-schemes"; + "recursive-line-count" = dontDistribute super."recursive-line-count"; + "redHandlers" = dontDistribute super."redHandlers"; + "reddit" = dontDistribute super."reddit"; + "redis" = dontDistribute super."redis"; + "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "reducers" = doDistribute super."reducers_3_10_3_2"; + "reenact" = dontDistribute super."reenact"; + "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; + "ref" = dontDistribute super."ref"; + "ref-mtl" = dontDistribute super."ref-mtl"; + "ref-tf" = dontDistribute super."ref-tf"; + "refcount" = dontDistribute super."refcount"; + "reference" = dontDistribute super."reference"; + "references" = dontDistribute super."references"; + "refh" = dontDistribute super."refh"; + "refined" = dontDistribute super."refined"; + "reflection" = doDistribute super."reflection_2"; + "reflection-extras" = dontDistribute super."reflection-extras"; + "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; + "reflex" = dontDistribute super."reflex"; + "reflex-animation" = dontDistribute super."reflex-animation"; + "reflex-dom" = dontDistribute super."reflex-dom"; + "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; + "reflex-gloss" = dontDistribute super."reflex-gloss"; + "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-transformers" = dontDistribute super."reflex-transformers"; + "reform" = dontDistribute super."reform"; + "reform-blaze" = dontDistribute super."reform-blaze"; + "reform-hamlet" = dontDistribute super."reform-hamlet"; + "reform-happstack" = dontDistribute super."reform-happstack"; + "reform-hsp" = dontDistribute super."reform-hsp"; + "regex-applicative-text" = dontDistribute super."regex-applicative-text"; + "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; + "regex-deriv" = dontDistribute super."regex-deriv"; + "regex-dfa" = dontDistribute super."regex-dfa"; + "regex-easy" = dontDistribute super."regex-easy"; + "regex-genex" = dontDistribute super."regex-genex"; + "regex-parsec" = dontDistribute super."regex-parsec"; + "regex-pderiv" = dontDistribute super."regex-pderiv"; + "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; + "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; + "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-text" = dontDistribute super."regex-tdfa-text"; + "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-xmlschema" = dontDistribute super."regex-xmlschema"; + "regexchar" = dontDistribute super."regexchar"; + "regexdot" = dontDistribute super."regexdot"; + "regexp-tries" = dontDistribute super."regexp-tries"; + "regexpr" = dontDistribute super."regexpr"; + "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; + "regexqq" = dontDistribute super."regexqq"; + "regional-pointers" = dontDistribute super."regional-pointers"; + "regions" = dontDistribute super."regions"; + "regions-monadsfd" = dontDistribute super."regions-monadsfd"; + "regions-monadstf" = dontDistribute super."regions-monadstf"; + "regions-mtl" = dontDistribute super."regions-mtl"; + "regress" = dontDistribute super."regress"; + "regular" = dontDistribute super."regular"; + "regular-extras" = dontDistribute super."regular-extras"; + "regular-web" = dontDistribute super."regular-web"; + "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; + "reheat" = dontDistribute super."reheat"; + "rehoo" = dontDistribute super."rehoo"; + "rei" = dontDistribute super."rei"; + "reified-records" = dontDistribute super."reified-records"; + "reify" = dontDistribute super."reify"; + "reinterpret-cast" = dontDistribute super."reinterpret-cast"; + "relacion" = dontDistribute super."relacion"; + "relation" = dontDistribute super."relation"; + "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = dontDistribute super."relational-query"; + "relational-query-HDBC" = dontDistribute super."relational-query-HDBC"; + "relational-record" = dontDistribute super."relational-record"; + "relational-record-examples" = dontDistribute super."relational-record-examples"; + "relational-schemas" = dontDistribute super."relational-schemas"; + "relative-date" = dontDistribute super."relative-date"; + "relit" = dontDistribute super."relit"; + "rematch" = dontDistribute super."rematch"; + "rematch-text" = dontDistribute super."rematch-text"; + "remote" = dontDistribute super."remote"; + "remote-debugger" = dontDistribute super."remote-debugger"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "repa" = doDistribute super."repa_3_4_0_1"; + "repa-algorithms" = doDistribute super."repa-algorithms_3_4_0_1"; + "repa-array" = dontDistribute super."repa-array"; + "repa-bytestring" = dontDistribute super."repa-bytestring"; + "repa-convert" = dontDistribute super."repa-convert"; + "repa-eval" = dontDistribute super."repa-eval"; + "repa-examples" = dontDistribute super."repa-examples"; + "repa-fftw" = dontDistribute super."repa-fftw"; + "repa-flow" = dontDistribute super."repa-flow"; + "repa-io" = doDistribute super."repa-io_3_4_0_1"; + "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; + "repa-plugin" = dontDistribute super."repa-plugin"; + "repa-scalar" = dontDistribute super."repa-scalar"; + "repa-series" = dontDistribute super."repa-series"; + "repa-sndfile" = dontDistribute super."repa-sndfile"; + "repa-stream" = dontDistribute super."repa-stream"; + "repa-v4l2" = dontDistribute super."repa-v4l2"; + "repl" = dontDistribute super."repl"; + "repl-toolkit" = dontDistribute super."repl-toolkit"; + "repline" = dontDistribute super."repline"; + "repo-based-blog" = dontDistribute super."repo-based-blog"; + "repr" = dontDistribute super."repr"; + "repr-tree-syb" = dontDistribute super."repr-tree-syb"; + "representable-functors" = dontDistribute super."representable-functors"; + "representable-profunctors" = dontDistribute super."representable-profunctors"; + "representable-tries" = dontDistribute super."representable-tries"; + "request-monad" = dontDistribute super."request-monad"; + "reserve" = dontDistribute super."reserve"; + "resistor-cube" = dontDistribute super."resistor-cube"; + "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts"; + "resource-effect" = dontDistribute super."resource-effect"; + "resource-embed" = dontDistribute super."resource-embed"; + "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; + "resource-pool-monad" = dontDistribute super."resource-pool-monad"; + "resource-simple" = dontDistribute super."resource-simple"; + "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_36_0_6"; + "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; + "rest-happstack" = doDistribute super."rest-happstack_0_2_10_8"; + "rest-snap" = doDistribute super."rest-snap_0_1_17_18"; + "rest-wai" = doDistribute super."rest-wai_0_1_0_8"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retryer" = dontDistribute super."retryer"; + "revdectime" = dontDistribute super."revdectime"; + "reverse-apply" = dontDistribute super."reverse-apply"; + "reverse-geocoding" = dontDistribute super."reverse-geocoding"; + "reversi" = dontDistribute super."reversi"; + "rewrite" = dontDistribute super."rewrite"; + "rewriting" = dontDistribute super."rewriting"; + "rex" = dontDistribute super."rex"; + "rezoom" = dontDistribute super."rezoom"; + "rfc3339" = dontDistribute super."rfc3339"; + "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; + "riak" = dontDistribute super."riak"; + "riak-protobuf" = dontDistribute super."riak-protobuf"; + "richreports" = dontDistribute super."richreports"; + "riemann" = dontDistribute super."riemann"; + "riff" = dontDistribute super."riff"; + "ring-buffer" = dontDistribute super."ring-buffer"; + "riot" = dontDistribute super."riot"; + "ripple" = dontDistribute super."ripple"; + "ripple-federation" = dontDistribute super."ripple-federation"; + "risc386" = dontDistribute super."risc386"; + "rivers" = dontDistribute super."rivers"; + "rivet" = dontDistribute super."rivet"; + "rivet-core" = dontDistribute super."rivet-core"; + "rivet-migration" = dontDistribute super."rivet-migration"; + "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; + "rlglue" = dontDistribute super."rlglue"; + "rmonad" = dontDistribute super."rmonad"; + "rncryptor" = dontDistribute super."rncryptor"; + "rng-utils" = dontDistribute super."rng-utils"; + "robin" = dontDistribute super."robin"; + "robot" = dontDistribute super."robot"; + "robots-txt" = dontDistribute super."robots-txt"; + "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; + "roguestar" = dontDistribute super."roguestar"; + "roguestar-engine" = dontDistribute super."roguestar-engine"; + "roguestar-gl" = dontDistribute super."roguestar-gl"; + "roguestar-glut" = dontDistribute super."roguestar-glut"; + "rollbar" = dontDistribute super."rollbar"; + "roller" = dontDistribute super."roller"; + "rolling-queue" = dontDistribute super."rolling-queue"; + "roman-numerals" = dontDistribute super."roman-numerals"; + "romkan" = dontDistribute super."romkan"; + "roots" = dontDistribute super."roots"; + "rope" = dontDistribute super."rope"; + "rosa" = dontDistribute super."rosa"; + "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; + "rosezipper" = dontDistribute super."rosezipper"; + "roshask" = dontDistribute super."roshask"; + "rosso" = dontDistribute super."rosso"; + "rot13" = dontDistribute super."rot13"; + "rotating-log" = dontDistribute super."rotating-log"; + "rounding" = dontDistribute super."rounding"; + "roundtrip" = dontDistribute super."roundtrip"; + "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; + "roundtrip-string" = dontDistribute super."roundtrip-string"; + "roundtrip-xml" = dontDistribute super."roundtrip-xml"; + "route-generator" = dontDistribute super."route-generator"; + "route-planning" = dontDistribute super."route-planning"; + "rowrecord" = dontDistribute super."rowrecord"; + "rpc" = dontDistribute super."rpc"; + "rpc-framework" = dontDistribute super."rpc-framework"; + "rpf" = dontDistribute super."rpf"; + "rpm" = dontDistribute super."rpm"; + "rsagl" = dontDistribute super."rsagl"; + "rsagl-frp" = dontDistribute super."rsagl-frp"; + "rsagl-math" = dontDistribute super."rsagl-math"; + "rspp" = dontDistribute super."rspp"; + "rss" = dontDistribute super."rss"; + "rss2irc" = dontDistribute super."rss2irc"; + "rtld" = dontDistribute super."rtld"; + "rtlsdr" = dontDistribute super."rtlsdr"; + "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; + "rtorrent-state" = dontDistribute super."rtorrent-state"; + "rubberband" = dontDistribute super."rubberband"; + "ruby-marshal" = dontDistribute super."ruby-marshal"; + "ruby-qq" = dontDistribute super."ruby-qq"; + "ruff" = dontDistribute super."ruff"; + "ruler" = dontDistribute super."ruler"; + "ruler-core" = dontDistribute super."ruler-core"; + "rungekutta" = dontDistribute super."rungekutta"; + "runghc" = dontDistribute super."runghc"; + "rwlock" = dontDistribute super."rwlock"; + "rws" = dontDistribute super."rws"; + "s-cargot" = dontDistribute super."s-cargot"; + "s3-signer" = dontDistribute super."s3-signer"; + "safe-access" = dontDistribute super."safe-access"; + "safe-failure" = dontDistribute super."safe-failure"; + "safe-failure-cme" = dontDistribute super."safe-failure-cme"; + "safe-freeze" = dontDistribute super."safe-freeze"; + "safe-globals" = dontDistribute super."safe-globals"; + "safe-lazy-io" = dontDistribute super."safe-lazy-io"; + "safe-length" = dontDistribute super."safe-length"; + "safe-plugins" = dontDistribute super."safe-plugins"; + "safe-printf" = dontDistribute super."safe-printf"; + "safeint" = dontDistribute super."safeint"; + "safer-file-handles" = dontDistribute super."safer-file-handles"; + "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; + "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; + "saferoute" = dontDistribute super."saferoute"; + "sai-shape-syb" = dontDistribute super."sai-shape-syb"; + "saltine" = dontDistribute super."saltine"; + "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; + "salvia" = dontDistribute super."salvia"; + "salvia-demo" = dontDistribute super."salvia-demo"; + "salvia-extras" = dontDistribute super."salvia-extras"; + "salvia-protocol" = dontDistribute super."salvia-protocol"; + "salvia-sessions" = dontDistribute super."salvia-sessions"; + "salvia-websocket" = dontDistribute super."salvia-websocket"; + "sample-frame" = dontDistribute super."sample-frame"; + "sample-frame-np" = dontDistribute super."sample-frame-np"; + "samtools" = dontDistribute super."samtools"; + "samtools-conduit" = dontDistribute super."samtools-conduit"; + "samtools-enumerator" = dontDistribute super."samtools-enumerator"; + "samtools-iteratee" = dontDistribute super."samtools-iteratee"; + "sandlib" = dontDistribute super."sandlib"; + "sandman" = dontDistribute super."sandman"; + "sarasvati" = dontDistribute super."sarasvati"; + "sasl" = dontDistribute super."sasl"; + "sat" = dontDistribute super."sat"; + "sat-micro-hs" = dontDistribute super."sat-micro-hs"; + "satchmo" = dontDistribute super."satchmo"; + "satchmo-backends" = dontDistribute super."satchmo-backends"; + "satchmo-examples" = dontDistribute super."satchmo-examples"; + "satchmo-funsat" = dontDistribute super."satchmo-funsat"; + "satchmo-minisat" = dontDistribute super."satchmo-minisat"; + "satchmo-toysat" = dontDistribute super."satchmo-toysat"; + "sbp" = dontDistribute super."sbp"; + "sc3-rdu" = dontDistribute super."sc3-rdu"; + "scalable-server" = dontDistribute super."scalable-server"; + "scaleimage" = dontDistribute super."scaleimage"; + "scalp-webhooks" = dontDistribute super."scalp-webhooks"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scat" = dontDistribute super."scat"; + "scc" = dontDistribute super."scc"; + "scenegraph" = dontDistribute super."scenegraph"; + "scgi" = dontDistribute super."scgi"; + "schedevr" = dontDistribute super."schedevr"; + "schedule-planner" = dontDistribute super."schedule-planner"; + "schedyield" = dontDistribute super."schedyield"; + "scholdoc" = dontDistribute super."scholdoc"; + "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; + "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; + "scholdoc-types" = dontDistribute super."scholdoc-types"; + "schonfinkeling" = dontDistribute super."schonfinkeling"; + "sci-ratio" = dontDistribute super."sci-ratio"; + "science-constants" = dontDistribute super."science-constants"; + "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; + "scion" = dontDistribute super."scion"; + "scion-browser" = dontDistribute super."scion-browser"; + "scons2dot" = dontDistribute super."scons2dot"; + "scope" = dontDistribute super."scope"; + "scope-cairo" = dontDistribute super."scope-cairo"; + "scottish" = dontDistribute super."scottish"; + "scotty-binding-play" = dontDistribute super."scotty-binding-play"; + "scotty-blaze" = dontDistribute super."scotty-blaze"; + "scotty-cookie" = dontDistribute super."scotty-cookie"; + "scotty-fay" = dontDistribute super."scotty-fay"; + "scotty-hastache" = dontDistribute super."scotty-hastache"; + "scotty-rest" = dontDistribute super."scotty-rest"; + "scotty-session" = dontDistribute super."scotty-session"; + "scotty-tls" = dontDistribute super."scotty-tls"; + "scp-streams" = dontDistribute super."scp-streams"; + "scrabble-bot" = dontDistribute super."scrabble-bot"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrypt" = dontDistribute super."scrypt"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "sdl2" = doDistribute super."sdl2_1_3_1"; + "sdl2-cairo" = dontDistribute super."sdl2-cairo"; + "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; + "sdl2-compositor" = dontDistribute super."sdl2-compositor"; + "sdl2-image" = dontDistribute super."sdl2-image"; + "sdl2-ttf" = dontDistribute super."sdl2-ttf"; + "sdnv" = dontDistribute super."sdnv"; + "sdr" = dontDistribute super."sdr"; + "seacat" = dontDistribute super."seacat"; + "seal-module" = dontDistribute super."seal-module"; + "search" = dontDistribute super."search"; + "sec" = dontDistribute super."sec"; + "secdh" = dontDistribute super."secdh"; + "seclib" = dontDistribute super."seclib"; + "second-transfer" = doDistribute super."second-transfer_0_6_1_0"; + "secp256k1" = dontDistribute super."secp256k1"; + "secret-santa" = dontDistribute super."secret-santa"; + "secret-sharing" = dontDistribute super."secret-sharing"; + "secrm" = dontDistribute super."secrm"; + "secure-sockets" = dontDistribute super."secure-sockets"; + "sednaDBXML" = dontDistribute super."sednaDBXML"; + "select" = dontDistribute super."select"; + "selectors" = dontDistribute super."selectors"; + "selenium" = dontDistribute super."selenium"; + "selenium-server" = dontDistribute super."selenium-server"; + "selfrestart" = dontDistribute super."selfrestart"; + "selinux" = dontDistribute super."selinux"; + "semaphore-plus" = dontDistribute super."semaphore-plus"; + "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; + "semigroups" = doDistribute super."semigroups_0_16_2_2"; + "semigroups-actions" = dontDistribute super."semigroups-actions"; + "semiring" = dontDistribute super."semiring"; + "semiring-simple" = dontDistribute super."semiring-simple"; + "semver-range" = dontDistribute super."semver-range"; + "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; + "sensenet" = dontDistribute super."sensenet"; + "sentry" = dontDistribute super."sentry"; + "senza" = dontDistribute super."senza"; + "separated" = dontDistribute super."separated"; + "seqaid" = dontDistribute super."seqaid"; + "seqid" = dontDistribute super."seqid"; + "seqid-streams" = dontDistribute super."seqid-streams"; + "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; + "sequence" = dontDistribute super."sequence"; + "sequent-core" = dontDistribute super."sequent-core"; + "sequential-index" = dontDistribute super."sequential-index"; + "sequor" = dontDistribute super."sequor"; + "serial" = dontDistribute super."serial"; + "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; + "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; + "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pool" = dontDistribute super."servant-pool"; + "servant-postgresql" = dontDistribute super."servant-postgresql"; + "servant-response" = dontDistribute super."servant-response"; + "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = dontDistribute super."servant-swagger"; + "servant-yaml" = dontDistribute super."servant-yaml"; + "servius" = dontDistribute super."servius"; + "ses-html" = dontDistribute super."ses-html"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setops" = dontDistribute super."setops"; + "sets" = dontDistribute super."sets"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-show" = dontDistribute super."sexp-show"; + "sexpr" = dontDistribute super."sexpr"; + "sext" = dontDistribute super."sext"; + "sfml-audio" = dontDistribute super."sfml-audio"; + "sfmt" = dontDistribute super."sfmt"; + "sgd" = dontDistribute super."sgd"; + "sgf" = dontDistribute super."sgf"; + "sgrep" = dontDistribute super."sgrep"; + "sha-streams" = dontDistribute super."sha-streams"; + "shadower" = dontDistribute super."shadower"; + "shadowsocks" = dontDistribute super."shadowsocks"; + "shady-gen" = dontDistribute super."shady-gen"; + "shady-graphics" = dontDistribute super."shady-graphics"; + "shake-cabal-build" = dontDistribute super."shake-cabal-build"; + "shake-extras" = dontDistribute super."shake-extras"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-css" = dontDistribute super."shakespeare-css"; + "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; + "shakespeare-js" = dontDistribute super."shakespeare-js"; + "shakespeare-text" = dontDistribute super."shakespeare-text"; + "shana" = dontDistribute super."shana"; + "shapefile" = dontDistribute super."shapefile"; + "shapely-data" = dontDistribute super."shapely-data"; + "sharc-timbre" = dontDistribute super."sharc-timbre"; + "shared-buffer" = dontDistribute super."shared-buffer"; + "shared-fields" = dontDistribute super."shared-fields"; + "shared-memory" = dontDistribute super."shared-memory"; + "sharedio" = dontDistribute super."sharedio"; + "she" = dontDistribute super."she"; + "shelduck" = dontDistribute super."shelduck"; + "shell-escape" = dontDistribute super."shell-escape"; + "shell-monad" = dontDistribute super."shell-monad"; + "shell-pipe" = dontDistribute super."shell-pipe"; + "shellish" = dontDistribute super."shellish"; + "shellmate" = dontDistribute super."shellmate"; + "shelly-extra" = dontDistribute super."shelly-extra"; + "shivers-cfg" = dontDistribute super."shivers-cfg"; + "shoap" = dontDistribute super."shoap"; + "shortcircuit" = dontDistribute super."shortcircuit"; + "shorten-strings" = dontDistribute super."shorten-strings"; + "should-not-typecheck" = dontDistribute super."should-not-typecheck"; + "show-type" = dontDistribute super."show-type"; + "showdown" = dontDistribute super."showdown"; + "shpider" = dontDistribute super."shpider"; + "shplit" = dontDistribute super."shplit"; + "shqq" = dontDistribute super."shqq"; + "shuffle" = dontDistribute super."shuffle"; + "sieve" = dontDistribute super."sieve"; + "sifflet" = dontDistribute super."sifflet"; + "sifflet-lib" = dontDistribute super."sifflet-lib"; + "sign" = dontDistribute super."sign"; + "signal" = dontDistribute super."signal"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "simple" = dontDistribute super."simple"; + "simple-actors" = dontDistribute super."simple-actors"; + "simple-atom" = dontDistribute super."simple-atom"; + "simple-bluetooth" = dontDistribute super."simple-bluetooth"; + "simple-c-value" = dontDistribute super."simple-c-value"; + "simple-conduit" = dontDistribute super."simple-conduit"; + "simple-config" = dontDistribute super."simple-config"; + "simple-css" = dontDistribute super."simple-css"; + "simple-eval" = dontDistribute super."simple-eval"; + "simple-firewire" = dontDistribute super."simple-firewire"; + "simple-form" = dontDistribute super."simple-form"; + "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; + "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; + "simple-get-opt" = dontDistribute super."simple-get-opt"; + "simple-index" = dontDistribute super."simple-index"; + "simple-log" = dontDistribute super."simple-log"; + "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-neural-networks" = dontDistribute super."simple-neural-networks"; + "simple-nix" = dontDistribute super."simple-nix"; + "simple-observer" = dontDistribute super."simple-observer"; + "simple-pascal" = dontDistribute super."simple-pascal"; + "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; + "simple-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-session" = dontDistribute super."simple-session"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-smt" = dontDistribute super."simple-smt"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "simple-templates" = dontDistribute super."simple-templates"; + "simple-vec3" = dontDistribute super."simple-vec3"; + "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; + "simpleirc-lens" = dontDistribute super."simpleirc-lens"; + "simplenote" = dontDistribute super."simplenote"; + "simpleprelude" = dontDistribute super."simpleprelude"; + "simplesmtpclient" = dontDistribute super."simplesmtpclient"; + "simplessh" = dontDistribute super."simplessh"; + "simplest-sqlite" = dontDistribute super."simplest-sqlite"; + "simplex" = dontDistribute super."simplex"; + "simplex-basic" = dontDistribute super."simplex-basic"; + "simseq" = dontDistribute super."simseq"; + "simtreelo" = dontDistribute super."simtreelo"; + "sindre" = dontDistribute super."sindre"; + "singleton-nats" = dontDistribute super."singleton-nats"; + "singletons" = doDistribute super."singletons_1_1_2_1"; + "sink" = dontDistribute super."sink"; + "sirkel" = dontDistribute super."sirkel"; + "sitemap" = dontDistribute super."sitemap"; + "sized" = dontDistribute super."sized"; + "sized-types" = dontDistribute super."sized-types"; + "sized-vector" = dontDistribute super."sized-vector"; + "sizes" = dontDistribute super."sizes"; + "sjsp" = dontDistribute super."sjsp"; + "skeleton" = dontDistribute super."skeleton"; + "skeletons" = dontDistribute super."skeletons"; + "skell" = dontDistribute super."skell"; + "skype4hs" = dontDistribute super."skype4hs"; + "skypelogexport" = dontDistribute super."skypelogexport"; + "slack" = dontDistribute super."slack"; + "slack-api" = dontDistribute super."slack-api"; + "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; + "slidemews" = dontDistribute super."slidemews"; + "sloane" = dontDistribute super."sloane"; + "slot-lambda" = dontDistribute super."slot-lambda"; + "sloth" = dontDistribute super."sloth"; + "smallarray" = dontDistribute super."smallarray"; + "smallcaps" = dontDistribute super."smallcaps"; + "smallcheck-laws" = dontDistribute super."smallcheck-laws"; + "smallcheck-lens" = dontDistribute super."smallcheck-lens"; + "smallcheck-series" = dontDistribute super."smallcheck-series"; + "smallpt-hs" = dontDistribute super."smallpt-hs"; + "smallstring" = dontDistribute super."smallstring"; + "smaoin" = dontDistribute super."smaoin"; + "smartGroup" = dontDistribute super."smartGroup"; + "smartcheck" = dontDistribute super."smartcheck"; + "smartconstructor" = dontDistribute super."smartconstructor"; + "smartword" = dontDistribute super."smartword"; + "sme" = dontDistribute super."sme"; + "smsaero" = dontDistribute super."smsaero"; + "smt-lib" = dontDistribute super."smt-lib"; + "smtlib2" = dontDistribute super."smtlib2"; + "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; + "smtp2mta" = dontDistribute super."smtp2mta"; + "smtps-gmail" = dontDistribute super."smtps-gmail"; + "snake-game" = dontDistribute super."snake-game"; + "snap-accept" = dontDistribute super."snap-accept"; + "snap-app" = dontDistribute super."snap-app"; + "snap-auth-cli" = dontDistribute super."snap-auth-cli"; + "snap-blaze" = dontDistribute super."snap-blaze"; + "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; + "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-cors" = dontDistribute super."snap-cors"; + "snap-elm" = dontDistribute super."snap-elm"; + "snap-error-collector" = dontDistribute super."snap-error-collector"; + "snap-extras" = dontDistribute super."snap-extras"; + "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; + "snap-loader-static" = dontDistribute super."snap-loader-static"; + "snap-predicates" = dontDistribute super."snap-predicates"; + "snap-testing" = dontDistribute super."snap-testing"; + "snap-utils" = dontDistribute super."snap-utils"; + "snap-web-routes" = dontDistribute super."snap-web-routes"; + "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; + "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; + "snaplet-amqp" = dontDistribute super."snaplet-amqp"; + "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; + "snaplet-coffee" = dontDistribute super."snaplet-coffee"; + "snaplet-css-min" = dontDistribute super."snaplet-css-min"; + "snaplet-environments" = dontDistribute super."snaplet-environments"; + "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; + "snaplet-hasql" = dontDistribute super."snaplet-hasql"; + "snaplet-haxl" = dontDistribute super."snaplet-haxl"; + "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; + "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; + "snaplet-i18n" = dontDistribute super."snaplet-i18n"; + "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; + "snaplet-lss" = dontDistribute super."snaplet-lss"; + "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; + "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; + "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; + "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; + "snaplet-oauth" = dontDistribute super."snaplet-oauth"; + "snaplet-persistent" = dontDistribute super."snaplet-persistent"; + "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; + "snaplet-postmark" = dontDistribute super."snaplet-postmark"; + "snaplet-purescript" = dontDistribute super."snaplet-purescript"; + "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; + "snaplet-redis" = dontDistribute super."snaplet-redis"; + "snaplet-redson" = dontDistribute super."snaplet-redson"; + "snaplet-rest" = dontDistribute super."snaplet-rest"; + "snaplet-riak" = dontDistribute super."snaplet-riak"; + "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-sedna" = dontDistribute super."snaplet-sedna"; + "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; + "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; + "snaplet-stripe" = dontDistribute super."snaplet-stripe"; + "snaplet-tasks" = dontDistribute super."snaplet-tasks"; + "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; + "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; + "snappy" = dontDistribute super."snappy"; + "snappy-conduit" = dontDistribute super."snappy-conduit"; + "snappy-framing" = dontDistribute super."snappy-framing"; + "snappy-iteratee" = dontDistribute super."snappy-iteratee"; + "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; + "sneakyterm" = dontDistribute super."sneakyterm"; + "sneathlane-haste" = dontDistribute super."sneathlane-haste"; + "snippet-extractor" = dontDistribute super."snippet-extractor"; + "snm" = dontDistribute super."snm"; + "snow-white" = dontDistribute super."snow-white"; + "snowball" = dontDistribute super."snowball"; + "snowglobe" = dontDistribute super."snowglobe"; + "soap" = dontDistribute super."soap"; + "soap-openssl" = dontDistribute super."soap-openssl"; + "soap-tls" = dontDistribute super."soap-tls"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket" = dontDistribute super."socket"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "soegtk" = dontDistribute super."soegtk"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "sorted-list" = dontDistribute super."sorted-list"; + "sorting" = dontDistribute super."sorting"; + "sorty" = dontDistribute super."sorty"; + "sound-collage" = dontDistribute super."sound-collage"; + "sounddelay" = dontDistribute super."sounddelay"; + "source-code-server" = dontDistribute super."source-code-server"; + "sousit" = dontDistribute super."sousit"; + "sox" = dontDistribute super."sox"; + "soxlib" = dontDistribute super."soxlib"; + "soyuz" = dontDistribute super."soyuz"; + "spacefill" = dontDistribute super."spacefill"; + "spacepart" = dontDistribute super."spacepart"; + "spaceprobe" = dontDistribute super."spaceprobe"; + "spanout" = dontDistribute super."spanout"; + "sparse" = dontDistribute super."sparse"; + "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; + "sparsebit" = dontDistribute super."sparsebit"; + "sparsecheck" = dontDistribute super."sparsecheck"; + "sparser" = dontDistribute super."sparser"; + "spata" = dontDistribute super."spata"; + "spatial-math" = dontDistribute super."spatial-math"; + "spawn" = dontDistribute super."spawn"; + "spe" = dontDistribute super."spe"; + "special-functors" = dontDistribute super."special-functors"; + "special-keys" = dontDistribute super."special-keys"; + "specialize-th" = dontDistribute super."specialize-th"; + "species" = dontDistribute super."species"; + "speculation-transformers" = dontDistribute super."speculation-transformers"; + "speedy-slice" = dontDistribute super."speedy-slice"; + "spelling-suggest" = dontDistribute super."spelling-suggest"; + "sphero" = dontDistribute super."sphero"; + "sphinx-cli" = dontDistribute super."sphinx-cli"; + "spice" = dontDistribute super."spice"; + "spike" = dontDistribute super."spike"; + "spine" = dontDistribute super."spine"; + "spir-v" = dontDistribute super."spir-v"; + "splay" = dontDistribute super."splay"; + "splaytree" = dontDistribute super."splaytree"; + "spline3" = dontDistribute super."spline3"; + "splines" = dontDistribute super."splines"; + "split-channel" = dontDistribute super."split-channel"; + "split-record" = dontDistribute super."split-record"; + "split-tchan" = dontDistribute super."split-tchan"; + "splitter" = dontDistribute super."splitter"; + "splot" = dontDistribute super."splot"; + "spool" = dontDistribute super."spool"; + "spoonutil" = dontDistribute super."spoonutil"; + "spoty" = dontDistribute super."spoty"; + "spreadsheet" = dontDistribute super."spreadsheet"; + "spritz" = dontDistribute super."spritz"; + "spsa" = dontDistribute super."spsa"; + "spy" = dontDistribute super."spy"; + "sql-simple" = dontDistribute super."sql-simple"; + "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; + "sql-simple-pool" = dontDistribute super."sql-simple-pool"; + "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; + "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; + "sql-words" = dontDistribute super."sql-words"; + "sqlite" = dontDistribute super."sqlite"; + "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; + "sqlvalue-list" = dontDistribute super."sqlvalue-list"; + "squeeze" = dontDistribute super."squeeze"; + "sr-extra" = dontDistribute super."sr-extra"; + "srcinst" = dontDistribute super."srcinst"; + "srec" = dontDistribute super."srec"; + "sscgi" = dontDistribute super."sscgi"; + "ssh" = dontDistribute super."ssh"; + "sshd-lint" = dontDistribute super."sshd-lint"; + "sshtun" = dontDistribute super."sshtun"; + "sssp" = dontDistribute super."sssp"; + "sstable" = dontDistribute super."sstable"; + "ssv" = dontDistribute super."ssv"; + "stable-heap" = dontDistribute super."stable-heap"; + "stable-maps" = dontDistribute super."stable-maps"; + "stable-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; + "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; + "stackage-curator" = dontDistribute super."stackage-curator"; + "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; + "standalone-haddock" = dontDistribute super."standalone-haddock"; + "star-to-star" = dontDistribute super."star-to-star"; + "star-to-star-contra" = dontDistribute super."star-to-star-contra"; + "starling" = dontDistribute super."starling"; + "starrover2" = dontDistribute super."starrover2"; + "stash" = dontDistribute super."stash"; + "state" = dontDistribute super."state"; + "state-plus" = dontDistribute super."state-plus"; + "state-record" = dontDistribute super."state-record"; + "stateWriter" = dontDistribute super."stateWriter"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-firehose" = dontDistribute super."stm-firehose"; + "stm-io-hooks" = dontDistribute super."stm-io-hooks"; + "stm-lifted" = dontDistribute super."stm-lifted"; + "stm-linkedlist" = dontDistribute super."stm-linkedlist"; + "stm-orelse-io" = dontDistribute super."stm-orelse-io"; + "stm-promise" = dontDistribute super."stm-promise"; + "stm-queue-extras" = dontDistribute super."stm-queue-extras"; + "stm-sbchan" = dontDistribute super."stm-sbchan"; + "stm-split" = dontDistribute super."stm-split"; + "stm-tlist" = dontDistribute super."stm-tlist"; + "stmcontrol" = dontDistribute super."stmcontrol"; + "stomp-conduit" = dontDistribute super."stomp-conduit"; + "stomp-patterns" = dontDistribute super."stomp-patterns"; + "stomp-queue" = dontDistribute super."stomp-queue"; + "stompl" = dontDistribute super."stompl"; + "stopwatch" = dontDistribute super."stopwatch"; + "storable" = dontDistribute super."storable"; + "storable-record" = dontDistribute super."storable-record"; + "storable-static-array" = dontDistribute super."storable-static-array"; + "storable-tuple" = dontDistribute super."storable-tuple"; + "storablevector" = dontDistribute super."storablevector"; + "storablevector-carray" = dontDistribute super."storablevector-carray"; + "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; + "str" = dontDistribute super."str"; + "stratum-tool" = dontDistribute super."stratum-tool"; + "stream-fusion" = dontDistribute super."stream-fusion"; + "stream-monad" = dontDistribute super."stream-monad"; + "streamed" = dontDistribute super."streamed"; + "streaming" = dontDistribute super."streaming"; + "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streamproc" = dontDistribute super."streamproc"; + "strict-base-types" = dontDistribute super."strict-base-types"; + "strict-concurrency" = dontDistribute super."strict-concurrency"; + "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; + "strict-identity" = dontDistribute super."strict-identity"; + "strict-io" = dontDistribute super."strict-io"; + "strictify" = dontDistribute super."strictify"; + "strictly" = dontDistribute super."strictly"; + "string" = dontDistribute super."string"; + "string-conv" = dontDistribute super."string-conv"; + "string-convert" = dontDistribute super."string-convert"; + "string-qq" = dontDistribute super."string-qq"; + "string-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "stringlike" = dontDistribute super."stringlike"; + "stringprep" = dontDistribute super."stringprep"; + "strings" = dontDistribute super."strings"; + "stringtable-atom" = dontDistribute super."stringtable-atom"; + "strio" = dontDistribute super."strio"; + "stripe" = dontDistribute super."stripe"; + "stripe-core" = dontDistribute super."stripe-core"; + "stripe-haskell" = dontDistribute super."stripe-haskell"; + "stripe-http-streams" = dontDistribute super."stripe-http-streams"; + "strive" = dontDistribute super."strive"; + "strptime" = dontDistribute super."strptime"; + "structs" = dontDistribute super."structs"; + "structural-induction" = dontDistribute super."structural-induction"; + "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; + "structured-mongoDB" = dontDistribute super."structured-mongoDB"; + "structures" = dontDistribute super."structures"; + "stunclient" = dontDistribute super."stunclient"; + "stunts" = dontDistribute super."stunts"; + "stylized" = dontDistribute super."stylized"; + "sub-state" = dontDistribute super."sub-state"; + "subhask" = dontDistribute super."subhask"; + "subleq-toolchain" = dontDistribute super."subleq-toolchain"; + "subnet" = dontDistribute super."subnet"; + "subtitleParser" = dontDistribute super."subtitleParser"; + "subtitles" = dontDistribute super."subtitles"; + "success" = dontDistribute super."success"; + "suffixarray" = dontDistribute super."suffixarray"; + "suffixtree" = dontDistribute super."suffixtree"; + "sugarhaskell" = dontDistribute super."sugarhaskell"; + "suitable" = dontDistribute super."suitable"; + "sundown" = dontDistribute super."sundown"; + "sunlight" = dontDistribute super."sunlight"; + "sunroof-compiler" = dontDistribute super."sunroof-compiler"; + "sunroof-examples" = dontDistribute super."sunroof-examples"; + "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; + "supercollider-ht" = dontDistribute super."supercollider-ht"; + "supercollider-midi" = dontDistribute super."supercollider-midi"; + "superdoc" = dontDistribute super."superdoc"; + "supero" = dontDistribute super."supero"; + "supervisor" = dontDistribute super."supervisor"; + "suspend" = dontDistribute super."suspend"; + "svg2q" = dontDistribute super."svg2q"; + "svgcairo" = dontDistribute super."svgcairo"; + "svgutils" = dontDistribute super."svgutils"; + "svm" = dontDistribute super."svm"; + "svm-light-utils" = dontDistribute super."svm-light-utils"; + "svm-simple" = dontDistribute super."svm-simple"; + "svndump" = dontDistribute super."svndump"; + "swagger2" = dontDistribute super."swagger2"; + "swapper" = dontDistribute super."swapper"; + "swearjure" = dontDistribute super."swearjure"; + "swf" = dontDistribute super."swf"; + "swift-lda" = dontDistribute super."swift-lda"; + "swish" = dontDistribute super."swish"; + "sws" = dontDistribute super."sws"; + "syb-extras" = dontDistribute super."syb-extras"; + "syb-with-class" = dontDistribute super."syb-with-class"; + "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "sync" = dontDistribute super."sync"; + "sync-mht" = dontDistribute super."sync-mht"; + "synchronous-channels" = dontDistribute super."synchronous-channels"; + "syncthing-hs" = dontDistribute super."syncthing-hs"; + "synt" = dontDistribute super."synt"; + "syntactic" = dontDistribute super."syntactic"; + "syntactical" = dontDistribute super."syntactical"; + "syntax" = dontDistribute super."syntax"; + "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; + "syntax-example" = dontDistribute super."syntax-example"; + "syntax-example-json" = dontDistribute super."syntax-example-json"; + "syntax-pretty" = dontDistribute super."syntax-pretty"; + "syntax-printer" = dontDistribute super."syntax-printer"; + "syntax-trees" = dontDistribute super."syntax-trees"; + "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; + "synthesizer" = dontDistribute super."synthesizer"; + "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; + "synthesizer-core" = dontDistribute super."synthesizer-core"; + "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; + "synthesizer-filter" = dontDistribute super."synthesizer-filter"; + "synthesizer-inference" = dontDistribute super."synthesizer-inference"; + "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; + "synthesizer-midi" = dontDistribute super."synthesizer-midi"; + "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; + "sys-process" = dontDistribute super."sys-process"; + "system-canonicalpath" = dontDistribute super."system-canonicalpath"; + "system-command" = dontDistribute super."system-command"; + "system-gpio" = dontDistribute super."system-gpio"; + "system-inotify" = dontDistribute super."system-inotify"; + "system-lifted" = dontDistribute super."system-lifted"; + "system-random-effect" = dontDistribute super."system-random-effect"; + "system-time-monotonic" = dontDistribute super."system-time-monotonic"; + "system-util" = dontDistribute super."system-util"; + "system-uuid" = dontDistribute super."system-uuid"; + "systemd" = dontDistribute super."systemd"; + "syz" = dontDistribute super."syz"; + "t-regex" = dontDistribute super."t-regex"; + "ta" = dontDistribute super."ta"; + "table" = dontDistribute super."table"; + "table-tennis" = dontDistribute super."table-tennis"; + "tableaux" = dontDistribute super."tableaux"; + "tables" = dontDistribute super."tables"; + "tablestorage" = dontDistribute super."tablestorage"; + "tabloid" = dontDistribute super."tabloid"; + "taffybar" = dontDistribute super."taffybar"; + "tag-bits" = dontDistribute super."tag-bits"; + "tag-stream" = dontDistribute super."tag-stream"; + "tagchup" = dontDistribute super."tagchup"; + "tagged-exception-core" = dontDistribute super."tagged-exception-core"; + "tagged-list" = dontDistribute super."tagged-list"; + "tagged-th" = dontDistribute super."tagged-th"; + "tagged-transformer" = dontDistribute super."tagged-transformer"; + "tagging" = dontDistribute super."tagging"; + "taggy" = dontDistribute super."taggy"; + "taggy-lens" = dontDistribute super."taggy-lens"; + "taglib" = dontDistribute super."taglib"; + "taglib-api" = dontDistribute super."taglib-api"; + "tagset-positional" = dontDistribute super."tagset-positional"; + "tagsoup-ht" = dontDistribute super."tagsoup-ht"; + "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; + "takahashi" = dontDistribute super."takahashi"; + "takusen-oracle" = dontDistribute super."takusen-oracle"; + "tamarin-prover" = dontDistribute super."tamarin-prover"; + "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; + "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; + "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; + "tamper" = dontDistribute super."tamper"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; + "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-html" = dontDistribute super."tasty-html"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tasty-tap" = dontDistribute super."tasty-tap"; + "tateti-tateti" = dontDistribute super."tateti-tateti"; + "tau" = dontDistribute super."tau"; + "tbox" = dontDistribute super."tbox"; + "tcache-AWS" = dontDistribute super."tcache-AWS"; + "tccli" = dontDistribute super."tccli"; + "tce-conf" = dontDistribute super."tce-conf"; + "tconfig" = dontDistribute super."tconfig"; + "tcp" = dontDistribute super."tcp"; + "tdd-util" = dontDistribute super."tdd-util"; + "tdoc" = dontDistribute super."tdoc"; + "teams" = dontDistribute super."teams"; + "teeth" = dontDistribute super."teeth"; + "telegram" = dontDistribute super."telegram"; + "tellbot" = dontDistribute super."tellbot"; + "template-default" = dontDistribute super."template-default"; + "template-haskell-util" = dontDistribute super."template-haskell-util"; + "template-hsml" = dontDistribute super."template-hsml"; + "template-yj" = dontDistribute super."template-yj"; + "templatepg" = dontDistribute super."templatepg"; + "templater" = dontDistribute super."templater"; + "tempodb" = dontDistribute super."tempodb"; + "temporal-csound" = dontDistribute super."temporal-csound"; + "temporal-media" = dontDistribute super."temporal-media"; + "temporal-music-notation" = dontDistribute super."temporal-music-notation"; + "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; + "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; + "temporary-resourcet" = dontDistribute super."temporary-resourcet"; + "tempus" = dontDistribute super."tempus"; + "tempus-fugit" = dontDistribute super."tempus-fugit"; + "tensor" = dontDistribute super."tensor"; + "term-rewriting" = dontDistribute super."term-rewriting"; + "termbox-bindings" = dontDistribute super."termbox-bindings"; + "termination-combinators" = dontDistribute super."termination-combinators"; + "terminfo" = doDistribute super."terminfo_0_4_0_1"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "termplot" = dontDistribute super."termplot"; + "terrahs" = dontDistribute super."terrahs"; + "tersmu" = dontDistribute super."tersmu"; + "test-framework-doctest" = dontDistribute super."test-framework-doctest"; + "test-framework-golden" = dontDistribute super."test-framework-golden"; + "test-framework-program" = dontDistribute super."test-framework-program"; + "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; + "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; + "test-framework-skip" = dontDistribute super."test-framework-skip"; + "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck"; + "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; + "test-invariant" = dontDistribute super."test-invariant"; + "test-pkg" = dontDistribute super."test-pkg"; + "test-sandbox" = dontDistribute super."test-sandbox"; + "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; + "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; + "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; + "test-shouldbe" = dontDistribute super."test-shouldbe"; + "test-simple" = dontDistribute super."test-simple"; + "testPkg" = dontDistribute super."testPkg"; + "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; + "testloop" = dontDistribute super."testloop"; + "testpack" = dontDistribute super."testpack"; + "testpattern" = dontDistribute super."testpattern"; + "testrunner" = dontDistribute super."testrunner"; + "tetris" = dontDistribute super."tetris"; + "tex2txt" = dontDistribute super."tex2txt"; + "texrunner" = dontDistribute super."texrunner"; + "text-and-plots" = dontDistribute super."text-and-plots"; + "text-format-simple" = dontDistribute super."text-format-simple"; + "text-icu-translit" = dontDistribute super."text-icu-translit"; + "text-json-qq" = dontDistribute super."text-json-qq"; + "text-latin1" = dontDistribute super."text-latin1"; + "text-ldap" = dontDistribute super."text-ldap"; + "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-normal" = dontDistribute super."text-normal"; + "text-position" = dontDistribute super."text-position"; + "text-postgresql" = dontDistribute super."text-postgresql"; + "text-printer" = dontDistribute super."text-printer"; + "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2"; + "text-show-instances" = dontDistribute super."text-show-instances"; + "text-stream-decode" = dontDistribute super."text-stream-decode"; + "text-utf7" = dontDistribute super."text-utf7"; + "text-xml-generic" = dontDistribute super."text-xml-generic"; + "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text-zipper" = dontDistribute super."text-zipper"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "tfp" = dontDistribute super."tfp"; + "tfp-th" = dontDistribute super."tfp-th"; + "tftp" = dontDistribute super."tftp"; + "tga" = dontDistribute super."tga"; + "th-alpha" = dontDistribute super."th-alpha"; + "th-build" = dontDistribute super."th-build"; + "th-cas" = dontDistribute super."th-cas"; + "th-context" = dontDistribute super."th-context"; + "th-fold" = dontDistribute super."th-fold"; + "th-inline-io-action" = dontDistribute super."th-inline-io-action"; + "th-instance-reification" = dontDistribute super."th-instance-reification"; + "th-instances" = dontDistribute super."th-instances"; + "th-kinds" = dontDistribute super."th-kinds"; + "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift-instances" = dontDistribute super."th-lift-instances"; + "th-orphans" = doDistribute super."th-orphans_0_12_2"; + "th-printf" = dontDistribute super."th-printf"; + "th-sccs" = dontDistribute super."th-sccs"; + "th-traced" = dontDistribute super."th-traced"; + "th-typegraph" = dontDistribute super."th-typegraph"; + "themoviedb" = dontDistribute super."themoviedb"; + "themplate" = dontDistribute super."themplate"; + "theoremquest" = dontDistribute super."theoremquest"; + "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = dontDistribute super."these"; + "thespian" = dontDistribute super."thespian"; + "theta-functions" = dontDistribute super."theta-functions"; + "thih" = dontDistribute super."thih"; + "thimk" = dontDistribute super."thimk"; + "thorn" = dontDistribute super."thorn"; + "thread-local-storage" = dontDistribute super."thread-local-storage"; + "threadPool" = dontDistribute super."threadPool"; + "threadmanager" = dontDistribute super."threadmanager"; + "threads-pool" = dontDistribute super."threads-pool"; + "threads-supervisor" = dontDistribute super."threads-supervisor"; + "threadscope" = dontDistribute super."threadscope"; + "threefish" = dontDistribute super."threefish"; + "threepenny-gui" = dontDistribute super."threepenny-gui"; + "thrift" = dontDistribute super."thrift"; + "thrist" = dontDistribute super."thrist"; + "throttle" = dontDistribute super."throttle"; + "thumbnail" = dontDistribute super."thumbnail"; + "tianbar" = dontDistribute super."tianbar"; + "tic-tac-toe" = dontDistribute super."tic-tac-toe"; + "tickle" = dontDistribute super."tickle"; + "tictactoe3d" = dontDistribute super."tictactoe3d"; + "tidal" = dontDistribute super."tidal"; + "tidal-midi" = dontDistribute super."tidal-midi"; + "tidal-vis" = dontDistribute super."tidal-vis"; + "tie-knot" = dontDistribute super."tie-knot"; + "tiempo" = dontDistribute super."tiempo"; + "tiger" = dontDistribute super."tiger"; + "tight-apply" = dontDistribute super."tight-apply"; + "tightrope" = dontDistribute super."tightrope"; + "tighttp" = dontDistribute super."tighttp"; + "tilings" = dontDistribute super."tilings"; + "timberc" = dontDistribute super."timberc"; + "time-extras" = dontDistribute super."time-extras"; + "time-exts" = dontDistribute super."time-exts"; + "time-http" = dontDistribute super."time-http"; + "time-interval" = dontDistribute super."time-interval"; + "time-io-access" = dontDistribute super."time-io-access"; + "time-patterns" = dontDistribute super."time-patterns"; + "time-qq" = dontDistribute super."time-qq"; + "time-recurrence" = dontDistribute super."time-recurrence"; + "time-series" = dontDistribute super."time-series"; + "time-units" = dontDistribute super."time-units"; + "time-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeless" = dontDistribute super."timeless"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tinytemplate" = dontDistribute super."tinytemplate"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; + "tls-extra" = dontDistribute super."tls-extra"; + "tmpl" = dontDistribute super."tmpl"; + "tn" = dontDistribute super."tn"; + "tnet" = dontDistribute super."tnet"; + "to-haskell" = dontDistribute super."to-haskell"; + "to-string-class" = dontDistribute super."to-string-class"; + "to-string-instances" = dontDistribute super."to-string-instances"; + "todos" = dontDistribute super."todos"; + "tofromxml" = dontDistribute super."tofromxml"; + "toilet" = dontDistribute super."toilet"; + "tokenify" = dontDistribute super."tokenify"; + "tokenize" = dontDistribute super."tokenize"; + "toktok" = dontDistribute super."toktok"; + "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; + "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; + "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; + "toml" = dontDistribute super."toml"; + "toolshed" = dontDistribute super."toolshed"; + "topkata" = dontDistribute super."topkata"; + "torch" = dontDistribute super."torch"; + "total" = dontDistribute super."total"; + "total-map" = dontDistribute super."total-map"; + "total-maps" = dontDistribute super."total-maps"; + "touched" = dontDistribute super."touched"; + "toysolver" = dontDistribute super."toysolver"; + "tpdb" = dontDistribute super."tpdb"; + "trace" = dontDistribute super."trace"; + "trace-call" = dontDistribute super."trace-call"; + "trace-function-call" = dontDistribute super."trace-function-call"; + "traced" = dontDistribute super."traced"; + "tracer" = dontDistribute super."tracer"; + "tracker" = dontDistribute super."tracker"; + "trajectory" = dontDistribute super."trajectory"; + "transactional-events" = dontDistribute super."transactional-events"; + "transf" = dontDistribute super."transf"; + "transformations" = dontDistribute super."transformations"; + "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compose" = dontDistribute super."transformers-compose"; + "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-free" = dontDistribute super."transformers-free"; + "transformers-runnable" = dontDistribute super."transformers-runnable"; + "transformers-supply" = dontDistribute super."transformers-supply"; + "transient" = dontDistribute super."transient"; + "translatable-intset" = dontDistribute super."translatable-intset"; + "translate" = dontDistribute super."translate"; + "travis" = dontDistribute super."travis"; + "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; + "trawl" = dontDistribute super."trawl"; + "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-monad" = dontDistribute super."tree-monad"; + "treemap-html" = dontDistribute super."treemap-html"; + "treemap-html-tools" = dontDistribute super."treemap-html-tools"; + "treersec" = dontDistribute super."treersec"; + "treeviz" = dontDistribute super."treeviz"; + "tremulous-query" = dontDistribute super."tremulous-query"; + "trhsx" = dontDistribute super."trhsx"; + "triangulation" = dontDistribute super."triangulation"; + "tries" = dontDistribute super."tries"; + "trimpolya" = dontDistribute super."trimpolya"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "true-name" = dontDistribute super."true-name"; + "truelevel" = dontDistribute super."truelevel"; + "trurl" = dontDistribute super."trurl"; + "truthful" = dontDistribute super."truthful"; + "tsession" = dontDistribute super."tsession"; + "tsession-happstack" = dontDistribute super."tsession-happstack"; + "tskiplist" = dontDistribute super."tskiplist"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_5"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple-gen" = dontDistribute super."tuple-gen"; + "tuple-generic" = dontDistribute super."tuple-generic"; + "tuple-hlist" = dontDistribute super."tuple-hlist"; + "tuple-lenses" = dontDistribute super."tuple-lenses"; + "tuple-morph" = dontDistribute super."tuple-morph"; + "tuple-th" = dontDistribute super."tuple-th"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; + "turing-music" = dontDistribute super."turing-music"; + "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; + "turni" = dontDistribute super."turni"; + "tweak" = dontDistribute super."tweak"; + "twentefp" = dontDistribute super."twentefp"; + "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; + "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; + "twentefp-graphs" = dontDistribute super."twentefp-graphs"; + "twentefp-number" = dontDistribute super."twentefp-number"; + "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; + "twentefp-trees" = dontDistribute super."twentefp-trees"; + "twentefp-websockets" = dontDistribute super."twentefp-websockets"; + "twhs" = dontDistribute super."twhs"; + "twidge" = dontDistribute super."twidge"; + "twilight-stm" = dontDistribute super."twilight-stm"; + "twilio" = dontDistribute super."twilio"; + "twill" = dontDistribute super."twill"; + "twiml" = dontDistribute super."twiml"; + "twine" = dontDistribute super."twine"; + "twisty" = dontDistribute super."twisty"; + "twitch" = dontDistribute super."twitch"; + "twitter" = dontDistribute super."twitter"; + "twitter-conduit" = dontDistribute super."twitter-conduit"; + "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-types" = dontDistribute super."twitter-types"; + "twitter-types-lens" = dontDistribute super."twitter-types-lens"; + "tx" = dontDistribute super."tx"; + "txt-sushi" = dontDistribute super."txt-sushi"; + "txt2rtf" = dontDistribute super."txt2rtf"; + "txtblk" = dontDistribute super."txtblk"; + "ty" = dontDistribute super."ty"; + "typalyze" = dontDistribute super."typalyze"; + "type-aligned" = dontDistribute super."type-aligned"; + "type-booleans" = dontDistribute super."type-booleans"; + "type-cereal" = dontDistribute super."type-cereal"; + "type-combinators" = dontDistribute super."type-combinators"; + "type-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "type-fun" = dontDistribute super."type-fun"; + "type-functions" = dontDistribute super."type-functions"; + "type-hint" = dontDistribute super."type-hint"; + "type-int" = dontDistribute super."type-int"; + "type-iso" = dontDistribute super."type-iso"; + "type-level" = dontDistribute super."type-level"; + "type-level-bst" = dontDistribute super."type-level-bst"; + "type-level-natural-number" = dontDistribute super."type-level-natural-number"; + "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; + "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; + "type-level-sets" = dontDistribute super."type-level-sets"; + "type-level-tf" = dontDistribute super."type-level-tf"; + "type-list" = doDistribute super."type-list_0_2_0_0"; + "type-natural" = dontDistribute super."type-natural"; + "type-ord" = dontDistribute super."type-ord"; + "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; + "type-prelude" = dontDistribute super."type-prelude"; + "type-settheory" = dontDistribute super."type-settheory"; + "type-spine" = dontDistribute super."type-spine"; + "type-structure" = dontDistribute super."type-structure"; + "type-sub-th" = dontDistribute super."type-sub-th"; + "type-unary" = dontDistribute super."type-unary"; + "typeable-th" = dontDistribute super."typeable-th"; + "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; + "typed-wire" = dontDistribute super."typed-wire"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel" = dontDistribute super."typelevel"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "tz" = dontDistribute super."tz"; + "tzdata" = dontDistribute super."tzdata"; + "uAgda" = dontDistribute super."uAgda"; + "ua-parser" = dontDistribute super."ua-parser"; + "uacpid" = dontDistribute super."uacpid"; + "uberlast" = dontDistribute super."uberlast"; + "uconv" = dontDistribute super."uconv"; + "udbus" = dontDistribute super."udbus"; + "udbus-model" = dontDistribute super."udbus-model"; + "udcode" = dontDistribute super."udcode"; + "udev" = dontDistribute super."udev"; + "uglymemo" = dontDistribute super."uglymemo"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unexceptionalio" = dontDistribute super."unexceptionalio"; + "unfoldable" = dontDistribute super."unfoldable"; + "ungadtagger" = dontDistribute super."ungadtagger"; + "uni-events" = dontDistribute super."uni-events"; + "uni-graphs" = dontDistribute super."uni-graphs"; + "uni-htk" = dontDistribute super."uni-htk"; + "uni-posixutil" = dontDistribute super."uni-posixutil"; + "uni-reactor" = dontDistribute super."uni-reactor"; + "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; + "uni-util" = dontDistribute super."uni-util"; + "unicode" = dontDistribute super."unicode"; + "unicode-names" = dontDistribute super."unicode-names"; + "unicode-normalization" = dontDistribute super."unicode-normalization"; + "unicode-prelude" = dontDistribute super."unicode-prelude"; + "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "unification-fd" = dontDistribute super."unification-fd"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union-find-array" = dontDistribute super."union-find-array"; + "union-map" = dontDistribute super."union-map"; + "unique" = dontDistribute super."unique"; + "unique-logic" = dontDistribute super."unique-logic"; + "unique-logic-tf" = dontDistribute super."unique-logic-tf"; + "uniqueid" = dontDistribute super."uniqueid"; + "unit" = dontDistribute super."unit"; + "units" = dontDistribute super."units"; + "units-attoparsec" = dontDistribute super."units-attoparsec"; + "units-defs" = dontDistribute super."units-defs"; + "units-parser" = dontDistribute super."units-parser"; + "unittyped" = dontDistribute super."unittyped"; + "universal-binary" = dontDistribute super."universal-binary"; + "universe" = dontDistribute super."universe"; + "universe-base" = dontDistribute super."universe-base"; + "universe-instances-base" = dontDistribute super."universe-instances-base"; + "universe-instances-extended" = dontDistribute super."universe-instances-extended"; + "universe-instances-trans" = dontDistribute super."universe-instances-trans"; + "universe-reverse-instances" = dontDistribute super."universe-reverse-instances"; + "universe-th" = dontDistribute super."universe-th"; + "unix-bytestring" = dontDistribute super."unix-bytestring"; + "unix-fcntl" = dontDistribute super."unix-fcntl"; + "unix-handle" = dontDistribute super."unix-handle"; + "unix-io-extra" = dontDistribute super."unix-io-extra"; + "unix-memory" = dontDistribute super."unix-memory"; + "unix-process-conduit" = dontDistribute super."unix-process-conduit"; + "unix-pty-light" = dontDistribute super."unix-pty-light"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; + "unordered-graphs" = dontDistribute super."unordered-graphs"; + "unpack-funcs" = dontDistribute super."unpack-funcs"; + "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; + "unsafe" = dontDistribute super."unsafe"; + "unsafe-promises" = dontDistribute super."unsafe-promises"; + "unsafely" = dontDistribute super."unsafely"; + "unsafeperformst" = dontDistribute super."unsafeperformst"; + "unscramble" = dontDistribute super."unscramble"; + "unusable-pkg" = dontDistribute super."unusable-pkg"; + "uom-plugin" = dontDistribute super."uom-plugin"; + "up" = dontDistribute super."up"; + "up-grade" = dontDistribute super."up-grade"; + "uploadcare" = dontDistribute super."uploadcare"; + "upskirt" = dontDistribute super."upskirt"; + "ureader" = dontDistribute super."ureader"; + "urembed" = dontDistribute super."urembed"; + "uri" = dontDistribute super."uri"; + "uri-conduit" = dontDistribute super."uri-conduit"; + "uri-enumerator" = dontDistribute super."uri-enumerator"; + "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; + "uri-template" = dontDistribute super."uri-template"; + "url-generic" = dontDistribute super."url-generic"; + "urlcheck" = dontDistribute super."urlcheck"; + "urldecode" = dontDistribute super."urldecode"; + "urldisp-happstack" = dontDistribute super."urldisp-happstack"; + "urlencoded" = dontDistribute super."urlencoded"; + "urlpath" = doDistribute super."urlpath_2_1_0"; + "urn" = dontDistribute super."urn"; + "urxml" = dontDistribute super."urxml"; + "usb" = dontDistribute super."usb"; + "usb-enumerator" = dontDistribute super."usb-enumerator"; + "usb-hid" = dontDistribute super."usb-hid"; + "usb-id-database" = dontDistribute super."usb-id-database"; + "usb-iteratee" = dontDistribute super."usb-iteratee"; + "usb-safe" = dontDistribute super."usb-safe"; + "userid" = dontDistribute super."userid"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "utility-ht" = dontDistribute super."utility-ht"; + "uu-cco" = dontDistribute super."uu-cco"; + "uu-cco-examples" = dontDistribute super."uu-cco-examples"; + "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; + "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; + "uu-options" = dontDistribute super."uu-options"; + "uu-tc" = dontDistribute super."uu-tc"; + "uuagc" = dontDistribute super."uuagc"; + "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; + "uuagc-cabal" = dontDistribute super."uuagc-cabal"; + "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; + "uuagd" = dontDistribute super."uuagd"; + "uuid-aeson" = dontDistribute super."uuid-aeson"; + "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; + "uuid-quasi" = dontDistribute super."uuid-quasi"; + "uulib" = dontDistribute super."uulib"; + "uvector" = dontDistribute super."uvector"; + "uvector-algorithms" = dontDistribute super."uvector-algorithms"; + "uxadt" = dontDistribute super."uxadt"; + "uzbl-with-source" = dontDistribute super."uzbl-with-source"; + "v4l2" = dontDistribute super."v4l2"; + "v4l2-examples" = dontDistribute super."v4l2-examples"; + "vacuum" = dontDistribute super."vacuum"; + "vacuum-cairo" = dontDistribute super."vacuum-cairo"; + "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; + "vacuum-opengl" = dontDistribute super."vacuum-opengl"; + "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; + "vado" = dontDistribute super."vado"; + "valid-names" = dontDistribute super."valid-names"; + "validate" = dontDistribute super."validate"; + "validate-input" = doDistribute super."validate-input_0_2_0_0"; + "validated-literals" = dontDistribute super."validated-literals"; + "validation" = dontDistribute super."validation"; + "validations" = dontDistribute super."validations"; + "value-supply" = dontDistribute super."value-supply"; + "vampire" = dontDistribute super."vampire"; + "var" = dontDistribute super."var"; + "varan" = dontDistribute super."varan"; + "variable-precision" = dontDistribute super."variable-precision"; + "variables" = dontDistribute super."variables"; + "varying" = dontDistribute super."varying"; + "vaultaire-common" = dontDistribute super."vaultaire-common"; + "vcache" = dontDistribute super."vcache"; + "vcache-trie" = dontDistribute super."vcache-trie"; + "vcard" = dontDistribute super."vcard"; + "vcd" = dontDistribute super."vcd"; + "vcs-revision" = dontDistribute super."vcs-revision"; + "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vcswrapper" = dontDistribute super."vcswrapper"; + "vect" = dontDistribute super."vect"; + "vect-floating" = dontDistribute super."vect-floating"; + "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; + "vect-opengl" = dontDistribute super."vect-opengl"; + "vector" = doDistribute super."vector_0_10_12_3"; + "vector-binary" = dontDistribute super."vector-binary"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = dontDistribute super."vector-fftw"; + "vector-functorlazy" = dontDistribute super."vector-functorlazy"; + "vector-heterogenous" = dontDistribute super."vector-heterogenous"; + "vector-instances-collections" = dontDistribute super."vector-instances-collections"; + "vector-mmap" = dontDistribute super."vector-mmap"; + "vector-random" = dontDistribute super."vector-random"; + "vector-read-instances" = dontDistribute super."vector-read-instances"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-static" = dontDistribute super."vector-static"; + "vector-strategies" = dontDistribute super."vector-strategies"; + "verbalexpressions" = dontDistribute super."verbalexpressions"; + "verbosity" = dontDistribute super."verbosity"; + "verdict" = dontDistribute super."verdict"; + "verdict-json" = dontDistribute super."verdict-json"; + "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; + "vhdl" = dontDistribute super."vhdl"; + "views" = dontDistribute super."views"; + "vigilance" = dontDistribute super."vigilance"; + "vimeta" = dontDistribute super."vimeta"; + "vimus" = dontDistribute super."vimus"; + "vintage-basic" = dontDistribute super."vintage-basic"; + "vinyl" = dontDistribute super."vinyl"; + "vinyl-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "virthualenv" = dontDistribute super."virthualenv"; + "vision" = dontDistribute super."vision"; + "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; + "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; + "vk-aws-route53" = dontDistribute super."vk-aws-route53"; + "vk-posix-pty" = dontDistribute super."vk-posix-pty"; + "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; + "vorbiscomment" = dontDistribute super."vorbiscomment"; + "vowpal-utils" = dontDistribute super."vowpal-utils"; + "voyeur" = dontDistribute super."voyeur"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "vty" = dontDistribute super."vty"; + "vty-examples" = dontDistribute super."vty-examples"; + "vty-menu" = dontDistribute super."vty-menu"; + "vty-ui" = dontDistribute super."vty-ui"; + "vty-ui-extras" = dontDistribute super."vty-ui-extras"; + "waddle" = dontDistribute super."waddle"; + "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-devel" = dontDistribute super."wai-devel"; + "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; + "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; + "wai-graceful" = dontDistribute super."wai-graceful"; + "wai-handler-devel" = dontDistribute super."wai-handler-devel"; + "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; + "wai-handler-snap" = dontDistribute super."wai-handler-snap"; + "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; + "wai-hastache" = dontDistribute super."wai-hastache"; + "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; + "wai-lens" = dontDistribute super."wai-lens"; + "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; + "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; + "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; + "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; + "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; + "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; + "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; + "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics"; + "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; + "wai-request-spec" = dontDistribute super."wai-request-spec"; + "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; + "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; + "wai-static-cache" = dontDistribute super."wai-static-cache"; + "wai-static-pages" = dontDistribute super."wai-static-pages"; + "wai-test" = dontDistribute super."wai-test"; + "wai-thrift" = dontDistribute super."wai-thrift"; + "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; + "wai-util" = dontDistribute super."wai-util"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_1_3_1"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls" = doDistribute super."warp-tls_3_1_3"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "wavefront" = dontDistribute super."wavefront"; + "wavesurfer" = dontDistribute super."wavesurfer"; + "wavy" = dontDistribute super."wavy"; + "wcwidth" = dontDistribute super."wcwidth"; + "weather-api" = dontDistribute super."weather-api"; + "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; + "web-css" = dontDistribute super."web-css"; + "web-encodings" = dontDistribute super."web-encodings"; + "web-mongrel2" = dontDistribute super."web-mongrel2"; + "web-page" = dontDistribute super."web-page"; + "web-plugins" = dontDistribute super."web-plugins"; + "web-routes" = dontDistribute super."web-routes"; + "web-routes-boomerang" = dontDistribute super."web-routes-boomerang"; + "web-routes-happstack" = dontDistribute super."web-routes-happstack"; + "web-routes-hsp" = dontDistribute super."web-routes-hsp"; + "web-routes-mtl" = dontDistribute super."web-routes-mtl"; + "web-routes-quasi" = dontDistribute super."web-routes-quasi"; + "web-routes-regular" = dontDistribute super."web-routes-regular"; + "web-routes-th" = dontDistribute super."web-routes-th"; + "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_3_1"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "websockets-snap" = dontDistribute super."websockets-snap"; + "webwire" = dontDistribute super."webwire"; + "wedding-announcement" = dontDistribute super."wedding-announcement"; + "wedged" = dontDistribute super."wedged"; + "weighted-regexp" = dontDistribute super."weighted-regexp"; + "weighted-search" = dontDistribute super."weighted-search"; + "welshy" = dontDistribute super."welshy"; + "wheb-mongo" = dontDistribute super."wheb-mongo"; + "wheb-redis" = dontDistribute super."wheb-redis"; + "wheb-strapped" = dontDistribute super."wheb-strapped"; + "while-lang-parser" = dontDistribute super."while-lang-parser"; + "whim" = dontDistribute super."whim"; + "whiskers" = dontDistribute super."whiskers"; + "whitespace" = dontDistribute super."whitespace"; + "whois" = dontDistribute super."whois"; + "why3" = dontDistribute super."why3"; + "wigner-symbols" = dontDistribute super."wigner-symbols"; + "wikipedia4epub" = dontDistribute super."wikipedia4epub"; + "win-hp-path" = dontDistribute super."win-hp-path"; + "windowslive" = dontDistribute super."windowslive"; + "winerror" = dontDistribute super."winerror"; + "winio" = dontDistribute super."winio"; + "wiring" = dontDistribute super."wiring"; + "withdependencies" = dontDistribute super."withdependencies"; + "witness" = dontDistribute super."witness"; + "witty" = dontDistribute super."witty"; + "wkt" = dontDistribute super."wkt"; + "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; + "wlc-hs" = dontDistribute super."wlc-hs"; + "wobsurv" = dontDistribute super."wobsurv"; + "woffex" = dontDistribute super."woffex"; + "wol" = dontDistribute super."wol"; + "wolf" = dontDistribute super."wolf"; + "woot" = dontDistribute super."woot"; + "word-trie" = dontDistribute super."word-trie"; + "word24" = dontDistribute super."word24"; + "wordcloud" = dontDistribute super."wordcloud"; + "wordexp" = dontDistribute super."wordexp"; + "words" = dontDistribute super."words"; + "wordsearch" = dontDistribute super."wordsearch"; + "wordsetdiff" = dontDistribute super."wordsetdiff"; + "workflow-osx" = dontDistribute super."workflow-osx"; + "wp-archivebot" = dontDistribute super."wp-archivebot"; + "wraparound" = dontDistribute super."wraparound"; + "wraxml" = dontDistribute super."wraxml"; + "wreq-sb" = dontDistribute super."wreq-sb"; + "wright" = dontDistribute super."wright"; + "wsedit" = dontDistribute super."wsedit"; + "wtk" = dontDistribute super."wtk"; + "wtk-gtk" = dontDistribute super."wtk-gtk"; + "wumpus-basic" = dontDistribute super."wumpus-basic"; + "wumpus-core" = dontDistribute super."wumpus-core"; + "wumpus-drawing" = dontDistribute super."wumpus-drawing"; + "wumpus-microprint" = dontDistribute super."wumpus-microprint"; + "wumpus-tree" = dontDistribute super."wumpus-tree"; + "wuss" = dontDistribute super."wuss"; + "wx" = dontDistribute super."wx"; + "wxAsteroids" = dontDistribute super."wxAsteroids"; + "wxFruit" = dontDistribute super."wxFruit"; + "wxc" = dontDistribute super."wxc"; + "wxcore" = dontDistribute super."wxcore"; + "wxdirect" = dontDistribute super."wxdirect"; + "wxhnotepad" = dontDistribute super."wxhnotepad"; + "wxturtle" = dontDistribute super."wxturtle"; + "wybor" = dontDistribute super."wybor"; + "wyvern" = dontDistribute super."wyvern"; + "x-dsp" = dontDistribute super."x-dsp"; + "x11-xim" = dontDistribute super."x11-xim"; + "x11-xinput" = dontDistribute super."x11-xinput"; + "x509-util" = dontDistribute super."x509-util"; + "xattr" = dontDistribute super."xattr"; + "xbattbar" = dontDistribute super."xbattbar"; + "xcb-types" = dontDistribute super."xcb-types"; + "xcffib" = dontDistribute super."xcffib"; + "xchat-plugin" = dontDistribute super."xchat-plugin"; + "xcp" = dontDistribute super."xcp"; + "xdg-basedir" = dontDistribute super."xdg-basedir"; + "xdg-userdirs" = dontDistribute super."xdg-userdirs"; + "xdot" = dontDistribute super."xdot"; + "xfconf" = dontDistribute super."xfconf"; + "xhaskell-library" = dontDistribute super."xhaskell-library"; + "xhb" = dontDistribute super."xhb"; + "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; + "xhb-ewmh" = dontDistribute super."xhb-ewmh"; + "xhtml" = doDistribute super."xhtml_3000_2_1"; + "xhtml-combinators" = dontDistribute super."xhtml-combinators"; + "xilinx-lava" = dontDistribute super."xilinx-lava"; + "xine" = dontDistribute super."xine"; + "xing-api" = dontDistribute super."xing-api"; + "xinput-conduit" = dontDistribute super."xinput-conduit"; + "xkbcommon" = dontDistribute super."xkbcommon"; + "xkcd" = dontDistribute super."xkcd"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit-parse" = dontDistribute super."xml-conduit-parse"; + "xml-conduit-writer" = dontDistribute super."xml-conduit-writer"; + "xml-enumerator" = dontDistribute super."xml-enumerator"; + "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; + "xml-extractors" = dontDistribute super."xml-extractors"; + "xml-helpers" = dontDistribute super."xml-helpers"; + "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; + "xml-monad" = dontDistribute super."xml-monad"; + "xml-parsec" = dontDistribute super."xml-parsec"; + "xml-picklers" = dontDistribute super."xml-picklers"; + "xml-pipe" = dontDistribute super."xml-pipe"; + "xml-prettify" = dontDistribute super."xml-prettify"; + "xml-push" = dontDistribute super."xml-push"; + "xml2html" = dontDistribute super."xml2html"; + "xml2json" = dontDistribute super."xml2json"; + "xml2x" = dontDistribute super."xml2x"; + "xmltv" = dontDistribute super."xmltv"; + "xmms2-client" = dontDistribute super."xmms2-client"; + "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; + "xmobar" = dontDistribute super."xmobar"; + "xmonad" = dontDistribute super."xmonad"; + "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; + "xmonad-contrib" = dontDistribute super."xmonad-contrib"; + "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; + "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; + "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; + "xmonad-eval" = dontDistribute super."xmonad-eval"; + "xmonad-extras" = dontDistribute super."xmonad-extras"; + "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; + "xmonad-utils" = dontDistribute super."xmonad-utils"; + "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; + "xmonad-windownames" = dontDistribute super."xmonad-windownames"; + "xmpipe" = dontDistribute super."xmpipe"; + "xorshift" = dontDistribute super."xorshift"; + "xosd" = dontDistribute super."xosd"; + "xournal-builder" = dontDistribute super."xournal-builder"; + "xournal-convert" = dontDistribute super."xournal-convert"; + "xournal-parser" = dontDistribute super."xournal-parser"; + "xournal-render" = dontDistribute super."xournal-render"; + "xournal-types" = dontDistribute super."xournal-types"; + "xsact" = dontDistribute super."xsact"; + "xsd" = dontDistribute super."xsd"; + "xsha1" = dontDistribute super."xsha1"; + "xslt" = dontDistribute super."xslt"; + "xtc" = dontDistribute super."xtc"; + "xtest" = dontDistribute super."xtest"; + "xturtle" = dontDistribute super."xturtle"; + "xxhash" = dontDistribute super."xxhash"; + "y0l0bot" = dontDistribute super."y0l0bot"; + "yabi" = dontDistribute super."yabi"; + "yabi-muno" = dontDistribute super."yabi-muno"; + "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; + "yahoo-web-search" = dontDistribute super."yahoo-web-search"; + "yajl" = dontDistribute super."yajl"; + "yajl-enumerator" = dontDistribute super."yajl-enumerator"; + "yall" = dontDistribute super."yall"; + "yamemo" = dontDistribute super."yamemo"; + "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light" = dontDistribute super."yaml-light"; + "yaml-light-lens" = dontDistribute super."yaml-light-lens"; + "yaml-rpc" = dontDistribute super."yaml-rpc"; + "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; + "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; + "yaml2owl" = dontDistribute super."yaml2owl"; + "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; + "yampa-canvas" = dontDistribute super."yampa-canvas"; + "yampa-glfw" = dontDistribute super."yampa-glfw"; + "yampa-glut" = dontDistribute super."yampa-glut"; + "yampa2048" = dontDistribute super."yampa2048"; + "yaop" = dontDistribute super."yaop"; + "yap" = dontDistribute super."yap"; + "yarr" = dontDistribute super."yarr"; + "yarr-image-io" = dontDistribute super."yarr-image-io"; + "yate" = dontDistribute super."yate"; + "yavie" = dontDistribute super."yavie"; + "ycextra" = dontDistribute super."ycextra"; + "yeganesh" = dontDistribute super."yeganesh"; + "yeller" = dontDistribute super."yeller"; + "yes-precure5-command" = dontDistribute super."yes-precure5-command"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; + "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; + "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; + "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; + "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; + "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; + "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; + "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; + "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-crud" = dontDistribute super."yesod-crud"; + "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; + "yesod-csp" = dontDistribute super."yesod-csp"; + "yesod-datatables" = dontDistribute super."yesod-datatables"; + "yesod-dsl" = dontDistribute super."yesod-dsl"; + "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-goodies" = dontDistribute super."yesod-goodies"; + "yesod-json" = dontDistribute super."yesod-json"; + "yesod-links" = dontDistribute super."yesod-links"; + "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-markdown" = dontDistribute super."yesod-markdown"; + "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1"; + "yesod-paginate" = dontDistribute super."yesod-paginate"; + "yesod-pagination" = dontDistribute super."yesod-pagination"; + "yesod-paginator" = dontDistribute super."yesod-paginator"; + "yesod-platform" = dontDistribute super."yesod-platform"; + "yesod-pnotify" = dontDistribute super."yesod-pnotify"; + "yesod-pure" = dontDistribute super."yesod-pure"; + "yesod-purescript" = dontDistribute super."yesod-purescript"; + "yesod-raml" = dontDistribute super."yesod-raml"; + "yesod-raml-bin" = dontDistribute super."yesod-raml-bin"; + "yesod-raml-docs" = dontDistribute super."yesod-raml-docs"; + "yesod-raml-mock" = dontDistribute super."yesod-raml-mock"; + "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; + "yesod-routes" = dontDistribute super."yesod-routes"; + "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; + "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; + "yesod-rst" = dontDistribute super."yesod-rst"; + "yesod-s3" = dontDistribute super."yesod-s3"; + "yesod-sass" = dontDistribute super."yesod-sass"; + "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-table" = doDistribute super."yesod-table_1_0_6"; + "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test" = doDistribute super."yesod-test_1_4_4"; + "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-tls" = dontDistribute super."yesod-tls"; + "yesod-transloadit" = dontDistribute super."yesod-transloadit"; + "yesod-vend" = dontDistribute super."yesod-vend"; + "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; + "yesod-worker" = dontDistribute super."yesod-worker"; + "yet-another-logger" = dontDistribute super."yet-another-logger"; + "yhccore" = dontDistribute super."yhccore"; + "yi" = dontDistribute super."yi"; + "yi-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-language" = dontDistribute super."yi-language"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-rope" = dontDistribute super."yi-rope"; + "yi-snippet" = dontDistribute super."yi-snippet"; + "yi-solarized" = dontDistribute super."yi-solarized"; + "yi-spolsky" = dontDistribute super."yi-spolsky"; + "yi-vty" = dontDistribute super."yi-vty"; + "yices" = dontDistribute super."yices"; + "yices-easy" = dontDistribute super."yices-easy"; + "yices-painless" = dontDistribute super."yices-painless"; + "yjftp" = dontDistribute super."yjftp"; + "yjftp-libs" = dontDistribute super."yjftp-libs"; + "yjsvg" = dontDistribute super."yjsvg"; + "yjtools" = dontDistribute super."yjtools"; + "yocto" = dontDistribute super."yocto"; + "yoko" = dontDistribute super."yoko"; + "york-lava" = dontDistribute super."york-lava"; + "youtube" = dontDistribute super."youtube"; + "yql" = dontDistribute super."yql"; + "yst" = dontDistribute super."yst"; + "yuiGrid" = dontDistribute super."yuiGrid"; + "yuuko" = dontDistribute super."yuuko"; + "yxdb-utils" = dontDistribute super."yxdb-utils"; + "z3" = dontDistribute super."z3"; + "zalgo" = dontDistribute super."zalgo"; + "zampolit" = dontDistribute super."zampolit"; + "zasni-gerna" = dontDistribute super."zasni-gerna"; + "zcache" = dontDistribute super."zcache"; + "zenc" = dontDistribute super."zenc"; + "zendesk-api" = dontDistribute super."zendesk-api"; + "zeno" = dontDistribute super."zeno"; + "zerobin" = dontDistribute super."zerobin"; + "zeromq-haskell" = dontDistribute super."zeromq-haskell"; + "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; + "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; + "zeroth" = dontDistribute super."zeroth"; + "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zim-parser" = dontDistribute super."zim-parser"; + "zip-conduit" = dontDistribute super."zip-conduit"; + "zipedit" = dontDistribute super."zipedit"; + "zipkin" = dontDistribute super."zipkin"; + "zipper" = dontDistribute super."zipper"; + "zippers" = dontDistribute super."zippers"; + "zippo" = dontDistribute super."zippo"; + "zlib-conduit" = dontDistribute super."zlib-conduit"; + "zmcat" = dontDistribute super."zmcat"; + "zmidi-core" = dontDistribute super."zmidi-core"; + "zmidi-score" = dontDistribute super."zmidi-score"; + "zmqat" = dontDistribute super."zmqat"; + "zoneinfo" = dontDistribute super."zoneinfo"; + "zoom" = dontDistribute super."zoom"; + "zoom-cache" = dontDistribute super."zoom-cache"; + "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; + "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; + "zoom-refs" = dontDistribute super."zoom-refs"; + "zot" = dontDistribute super."zot"; + "zsh-battery" = dontDistribute super."zsh-battery"; + "ztail" = dontDistribute super."ztail"; + +} diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 4108b741abb..ffc93b5d40e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -1140,6 +1140,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1505,6 +1506,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2073,6 +2075,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2393,6 +2396,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2795,6 +2799,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_4_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2865,6 +2870,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3425,6 +3431,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4446,6 +4453,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4739,6 +4747,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4856,6 +4865,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5080,6 +5090,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5094,6 +5105,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5162,6 +5174,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5635,6 +5648,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5675,6 +5689,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6343,6 +6358,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6403,6 +6419,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6926,6 +6943,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_3_1"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; @@ -7164,6 +7182,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7322,6 +7341,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 1fdfea9471b..f2a6538601b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -1140,6 +1140,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1504,6 +1505,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2071,6 +2073,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2389,6 +2392,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2791,6 +2795,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_4_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2861,6 +2866,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3420,6 +3426,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4439,6 +4446,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4732,6 +4740,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4849,6 +4858,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5073,6 +5083,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5087,6 +5098,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5155,6 +5167,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5627,6 +5640,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5667,6 +5681,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6334,6 +6349,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6394,6 +6410,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6916,6 +6933,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_3_1"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; @@ -7153,6 +7171,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7311,6 +7330,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 5c430c964e7..daf12540108 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -1140,6 +1140,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1504,6 +1505,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2070,6 +2072,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2388,6 +2391,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2790,6 +2794,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_4_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2860,6 +2865,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3419,6 +3425,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4438,6 +4445,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4731,6 +4739,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4848,6 +4857,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5072,6 +5082,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5086,6 +5097,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5154,6 +5166,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5626,6 +5639,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5666,6 +5680,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6333,6 +6348,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6393,6 +6409,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6914,6 +6931,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_3_1"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7150,6 +7168,7 @@ self: super: { "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7308,6 +7327,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 1fef0ee9ab5..0f60a597a3e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -1140,6 +1140,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1503,6 +1504,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2068,6 +2070,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2385,6 +2388,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2787,6 +2791,7 @@ self: super: { "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; "extra" = doDistribute super."extra_1_4_1"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2855,6 +2860,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3414,6 +3420,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4428,6 +4435,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4720,6 +4728,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4837,6 +4846,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5060,6 +5070,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5074,6 +5085,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5142,6 +5154,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5613,6 +5626,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5653,6 +5667,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6316,6 +6331,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_2"; @@ -6376,6 +6392,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6896,6 +6913,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_4_1"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7130,6 +7148,7 @@ self: super: { "tasty-program" = dontDistribute super."tasty-program"; "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7287,6 +7306,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 7e5a7b255d1..7d972ee7b98 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -1139,6 +1139,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1502,6 +1503,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2066,6 +2068,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2383,6 +2386,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2783,6 +2787,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2851,6 +2856,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3407,6 +3413,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4419,6 +4426,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4708,6 +4716,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4824,6 +4833,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5046,6 +5056,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5060,6 +5071,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5128,6 +5140,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5598,6 +5611,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5638,6 +5652,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6298,6 +6313,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6358,6 +6374,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6878,6 +6895,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_4_1"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7112,6 +7130,7 @@ self: super: { "tasty-program" = dontDistribute super."tasty-program"; "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7269,6 +7288,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 248689a4e73..2011c11bd0d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -1138,6 +1138,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1497,6 +1498,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-orphans" = doDistribute super."binary-orphans_0_1_1_0"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2061,6 +2063,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2377,6 +2380,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2413,6 +2417,7 @@ self: super: { "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_3"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; @@ -2774,6 +2779,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2841,6 +2847,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3396,6 +3403,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4405,6 +4413,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4693,6 +4702,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4809,6 +4819,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5029,6 +5040,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5043,6 +5055,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5111,6 +5124,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5581,6 +5595,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5620,6 +5635,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6276,6 +6292,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6336,6 +6353,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6853,6 +6871,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_5_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7087,6 +7106,7 @@ self: super: { "tasty-program" = dontDistribute super."tasty-program"; "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7244,6 +7264,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 1a3443b757e..a93f85b0977 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -1138,6 +1138,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1496,6 +1497,7 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2056,6 +2058,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2371,6 +2374,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2406,6 +2410,7 @@ self: super: { "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; @@ -2763,6 +2768,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2830,6 +2836,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3385,6 +3392,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4394,6 +4402,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4682,6 +4691,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4798,6 +4808,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5017,6 +5028,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5031,6 +5043,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5098,6 +5111,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5568,6 +5582,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5607,6 +5622,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6260,6 +6276,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6320,6 +6337,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6837,6 +6855,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_5_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7061,6 +7080,7 @@ self: super: { "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; "tasty-html" = dontDistribute super."tasty-html"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7068,6 +7088,7 @@ self: super: { "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7225,6 +7246,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index dae5cef119c..60304efa594 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -1136,6 +1136,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1494,6 +1495,7 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-shared" = dontDistribute super."binary-shared"; @@ -2052,6 +2054,7 @@ self: super: { "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; @@ -2366,6 +2369,7 @@ self: super: { "delaunay" = dontDistribute super."delaunay"; "delicious" = dontDistribute super."delicious"; "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; "delta" = dontDistribute super."delta"; "delta-h" = dontDistribute super."delta-h"; "demarcate" = dontDistribute super."demarcate"; @@ -2401,6 +2405,7 @@ self: super: { "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; @@ -2756,6 +2761,7 @@ self: super: { "extensible-data" = dontDistribute super."extensible-data"; "extensible-effects" = dontDistribute super."extensible-effects"; "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -2823,6 +2829,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; @@ -3377,6 +3384,7 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_4"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -4386,6 +4394,7 @@ self: super: { "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; "indices" = dontDistribute super."indices"; "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; "infer-upstream" = dontDistribute super."infer-upstream"; "infernu" = dontDistribute super."infernu"; "infinite-search" = dontDistribute super."infinite-search"; @@ -4674,6 +4683,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-java" = doDistribute super."language-java_0_2_7"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4790,6 +4800,7 @@ self: super: { "libxslt" = dontDistribute super."libxslt"; "life" = dontDistribute super."life"; "lift-generics" = dontDistribute super."lift-generics"; + "lifted-async" = doDistribute super."lifted-async_0_7_0_1"; "lifted-threads" = dontDistribute super."lifted-threads"; "lifter" = dontDistribute super."lifter"; "ligature" = dontDistribute super."ligature"; @@ -5009,6 +5020,7 @@ self: super: { "mathista" = dontDistribute super."mathista"; "mathlink" = dontDistribute super."mathlink"; "matlab" = dontDistribute super."matlab"; + "matrices" = doDistribute super."matrices_0_4_2"; "matrix-market" = dontDistribute super."matrix-market"; "matrix-market-pure" = dontDistribute super."matrix-market-pure"; "matsuri" = dontDistribute super."matsuri"; @@ -5023,6 +5035,7 @@ self: super: { "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; "mcmc-types" = dontDistribute super."mcmc-types"; "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; "mecab" = dontDistribute super."mecab"; @@ -5090,6 +5103,7 @@ self: super: { "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; "minimal-configuration" = dontDistribute super."minimal-configuration"; "minimorph" = dontDistribute super."minimorph"; "minimung" = dontDistribute super."minimung"; @@ -5559,6 +5573,7 @@ self: super: { "ottparse-pretty" = dontDistribute super."ottparse-pretty"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; "package-o-tron" = dontDistribute super."package-o-tron"; "package-vt" = dontDistribute super."package-vt"; "packdeps" = dontDistribute super."packdeps"; @@ -5598,6 +5613,7 @@ self: super: { "parport" = dontDistribute super."parport"; "parse-dimacs" = dontDistribute super."parse-dimacs"; "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; "parsec-extra" = dontDistribute super."parsec-extra"; "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; @@ -6251,6 +6267,7 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; @@ -6311,6 +6328,7 @@ self: super: { "rope" = dontDistribute super."rope"; "rosa" = dontDistribute super."rosa"; "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; "rosezipper" = dontDistribute super."rosezipper"; "roshask" = dontDistribute super."roshask"; "rosso" = dontDistribute super."rosso"; @@ -6828,6 +6846,7 @@ self: super: { "stack" = doDistribute super."stack_0_1_5_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7052,6 +7071,7 @@ self: super: { "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; "tasty-html" = dontDistribute super."tasty-html"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7059,6 +7079,7 @@ self: super: { "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; "tasty-silver" = doDistribute super."tasty-silver_3_1_7"; + "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7216,6 +7237,7 @@ self: super: { "time-http" = dontDistribute super."time-http"; "time-interval" = dontDistribute super."time-interval"; "time-io-access" = dontDistribute super."time-io-access"; + "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0"; "time-patterns" = dontDistribute super."time-patterns"; "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a6f3fbc8a41..a9fa7ae4f10 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6314,18 +6314,19 @@ self: { }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUtil" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw + ({ mkDerivation, array, base, bytestring, containers, cpphs + , directory, filepath, JuicyPixels, linear, OpenGL, OpenGLRaw , transformers, vector }: mkDerivation { pname = "GLUtil"; - version = "0.8.7"; - sha256 = "4d7c2184d3aff8d124f34f2e2ebe6021201e8a174d8bb5ebabe3a50451a71642"; + version = "0.8.8"; + sha256 = "2ceb807d97c1c599d26be80d4bae98321cdbd59cff3af0dd68d1daa27615c7d4"; libraryHaskellDepends = [ - array base bytestring containers directory filepath hpp JuicyPixels + array base bytestring containers directory filepath JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; + libraryToolDepends = [ cpphs ]; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; @@ -6356,8 +6357,8 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.1.4"; - sha256 = "07dd9ba595757b458ce78691441b686ab3500cb129a175b185b11d5a6186a509"; + version = "2.1.5"; + sha256 = "9fa21d4eb6b09374e9119a304359d337eed96aa33fbbcf6df4ee6f5ef85da290"; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear transformers @@ -9548,8 +9549,8 @@ self: { }: mkDerivation { pname = "HaskRel"; - version = "0.1.0.1"; - sha256 = "737b391cb3063e243acd3d1bee2a3b5e6c0fce8f240f4c4df8c38d44287e6e47"; + version = "0.1.0.2"; + sha256 = "e7ce026b9791b8fcdea89555a7545d0b4e212982b0aed4e67946a7970ae907a7"; libraryHaskellDepends = [ base containers directory ghc-prim HList tagged ]; @@ -10020,6 +10021,7 @@ self: { homepage = "http://maartenfaddegon.nl"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HoleyMonoid" = callPackage @@ -16309,8 +16311,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, cereal, text }: mkDerivation { pname = "STL"; - version = "0.3.0.2"; - sha256 = "836c04dde459c7823e0130dff8e357d170b7a8105c838a73b0197972bbe3575d"; + version = "0.3.0.3"; + sha256 = "382247812f11b9f73cd9a02474fa68d402fac91471fac83dd0e15604a191548a"; libraryHaskellDepends = [ attoparsec base bytestring cereal text ]; homepage = "http://github.com/bergey/STL"; description = "STL 3D geometry format parsing and pretty-printing"; @@ -16403,12 +16405,11 @@ self: { }: mkDerivation { pname = "SWMMoutGetMB"; - version = "0.1.0.0"; - sha256 = "d4e07d1dba50b1733f6fe638ce9c3f6b5565f114c83923381c7ed23999392019"; + version = "0.1.0.1"; + sha256 = "a5bc7fb2c1b55dc8bc741bc0a7de92ceb7a5f418efbd2c43cc515b94c2c41083"; libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 split ]; - jailbreak = true; homepage = "https://github.com/siddhanathan/SWMMoutGetMB"; description = "A parser for SWMM 5 binary .OUT files"; license = stdenv.lib.licenses.gpl3; @@ -20435,6 +20436,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acid-state_0_14_0" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , directory, extensible-exceptions, filepath, mtl, network + , safecopy, stm, template-haskell, unix + }: + mkDerivation { + pname = "acid-state"; + version = "0.14.0"; + sha256 = "db7cc0fdfe0af9757f448a4184c88d5a8f2ac5e014bea1623a6272821a510621"; + libraryHaskellDepends = [ + array base bytestring cereal containers directory + extensible-exceptions filepath mtl network safecopy stm + template-haskell unix + ]; + homepage = "http://acid-state.seize.it/"; + description = "Add ACID guarantees to any serializable Haskell data structure"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "acid-state-dist" = callPackage ({ mkDerivation, acid-state, base, bytestring, cereal , concurrent-extra, containers, directory, filepath, mtl, random @@ -22600,8 +22621,8 @@ self: { }) {}; "alex_3_1_3" = callPackage - ({ mkDerivation, array, base, containers, directory, process - , QuickCheck + ({ mkDerivation, array, base, containers, directory, happy, perl + , process, QuickCheck }: mkDerivation { pname = "alex"; @@ -22614,7 +22635,9 @@ self: { executableHaskellDepends = [ array base containers directory QuickCheck ]; + executableToolDepends = [ happy ]; testHaskellDepends = [ base process ]; + testToolDepends = [ perl ]; doHaddock = false; jailbreak = true; doCheck = false; @@ -22622,11 +22645,11 @@ self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) perl;}; - "alex" = callPackage - ({ mkDerivation, array, base, containers, directory, process - , QuickCheck + "alex_3_1_4" = callPackage + ({ mkDerivation, array, base, containers, directory, happy, perl + , process, QuickCheck }: mkDerivation { pname = "alex"; @@ -22637,6 +22660,30 @@ self: { executableHaskellDepends = [ array base containers directory QuickCheck ]; + executableToolDepends = [ happy ]; + testHaskellDepends = [ base process ]; + testToolDepends = [ perl ]; + doCheck = false; + homepage = "http://www.haskell.org/alex/"; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) perl;}; + + "alex" = callPackage + ({ mkDerivation, array, base, containers, directory, happy, process + , QuickCheck + }: + mkDerivation { + pname = "alex"; + version = "3.1.5"; + sha256 = "ddadb06546c2d5677482a943ceefad6990936367712bf6e6ceae251163092210"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base containers directory QuickCheck + ]; + executableToolDepends = [ happy ]; testHaskellDepends = [ base process ]; doCheck = false; homepage = "http://www.haskell.org/alex/"; @@ -28158,16 +28205,13 @@ self: { }: mkDerivation { pname = "ansi-pretty"; - version = "0.1.0.0"; - sha256 = "9eba90356a94e3acc9227d60a2afa1f8e6bc853379b1da467a74913d04ffda1d"; - revision = "1"; - editedCabalFile = "7c4da8ee543df166730de7ac7bfdc2534b51dc39b138bcc160cf1e834b28f1d0"; + version = "0.1.1.0"; + sha256 = "46190d94e4fc2aa01c8bc4dfc1caf59fe38a0ed4a0c22d4d0567637d64b5ff45"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/futurice/haskell-ansi-pretty#readme"; description = "AnsiPretty for ansi-wl-pprint"; license = stdenv.lib.licenses.bsd3; @@ -28974,6 +29018,7 @@ self: { homepage = "https://bitbucket.org/kztk/app-lens"; description = "applicative (functional) bidirectional programming beyond composition chains"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "app-settings" = callPackage @@ -32171,8 +32216,8 @@ self: { }: mkDerivation { pname = "aws-ec2"; - version = "0.3.2"; - sha256 = "4d94e06fde2134eae21804b7b7a1798df838db2b3ebec2e68734cb6f6101ef71"; + version = "0.3.3"; + sha256 = "8d52e45cf9c37d728d1c76db6653ff56dbec853c1b924b46b1519387cc2aa3f4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32780,8 +32825,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.15"; - sha256 = "33d68e6eb0d54f4b99f23575b516ef13ccdb2edf3a399e00c8c28305c1569582"; + version = "0.5.16"; + sha256 = "f45b85a017c70df42dd461b2cd63967cc3fd1cc2653863686ab7edf8989de6d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34185,11 +34230,10 @@ self: { ({ mkDerivation, base, mtl, time }: mkDerivation { pname = "benchpress"; - version = "0.2.2.6"; - sha256 = "cf419681415deec13fa0fb53aa6290ab7a2d93abcef065d872137bf28453cfa7"; + version = "0.2.2.7"; + sha256 = "d09b80fd61f18ba76f19772a8fb013d1aa1fd78590826c6fab12601778c562e6"; libraryHaskellDepends = [ base mtl time ]; - jailbreak = true; - homepage = "http://github.com/tibbe/benchpress"; + homepage = "https://github.com/WillSewell/benchpress"; description = "Micro-benchmarking with detailed statistics"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -35001,6 +35045,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-parser" = callPackage + ({ mkDerivation, base-prelude, bytestring, success, text + , transformers + }: + mkDerivation { + pname = "binary-parser"; + version = "0.5"; + sha256 = "75535438c172ce17ee8eb837a9c87c9b0c27d3b4e1abf0e3cbb88babeaea0925"; + libraryHaskellDepends = [ + base-prelude bytestring success text transformers + ]; + homepage = "https://github.com/nikita-volkov/binary-parser"; + description = "A highly-efficient but limited parser API specialised for bytestrings"; + license = stdenv.lib.licenses.mit; + }) {}; + "binary-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, mtl }: mkDerivation { @@ -38800,6 +38860,7 @@ self: { homepage = "https://github.com/derekelkins/buffon"; description = "An implementation of Buffon machines"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bugzilla" = callPackage @@ -44320,8 +44381,8 @@ self: { ({ mkDerivation, array, base, bytestring, parseargs }: mkDerivation { pname = "ciphersaber2"; - version = "0.1.1.0"; - sha256 = "7bd5446e37bc24ec0098136d5b46468f0ca184be3c45a07c3c07e1e6074bcc42"; + version = "0.1.1.1"; + sha256 = "bb5d725c40858bccc30ed189d6bf39fb790a4fefed965d7b72fcbbe506e50b86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring ]; @@ -50077,7 +50138,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "constraints" = callPackage + "constraints_0_4_1_3" = callPackage ({ mkDerivation, base, ghc-prim, newtype }: mkDerivation { pname = "constraints"; @@ -50087,9 +50148,10 @@ self: { homepage = "http://github.com/ekmett/constraints/"; description = "Constraint manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "constraints_0_6" = callPackage + "constraints" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl , transformers, transformers-compat }: @@ -50104,7 +50166,6 @@ self: { homepage = "http://github.com/ekmett/constraints/"; description = "Constraint manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constructible" = callPackage @@ -50280,6 +50341,8 @@ self: { pname = "containers"; version = "0.5.6.3"; sha256 = "1647e62e31ed066c61b4a3c1a4403ddb15210bab0e658d624af16f406d298dcd"; + revision = "1"; + editedCabalFile = "d62a931abcdc917811b7eff078c117e0f2b2c2ac030d843cbebb00b8c8f87a5e"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -51606,8 +51669,8 @@ self: { }: mkDerivation { pname = "court"; - version = "0.1.0.0"; - sha256 = "b69919049c02460f4f23ff2fb04d2887c1c2fa2bd2212a151c407c2799a9fb32"; + version = "0.1.0.1"; + sha256 = "bf285d7d1071029b189098e0b137e89d54887661f1a4d55d4d4e4d6790a463fb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57314,6 +57377,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "delimiter-separated" = callPackage + ({ mkDerivation, base, uhc-util, uulib }: + mkDerivation { + pname = "delimiter-separated"; + version = "0.1.0.0"; + sha256 = "0682662d702022579f40b411b234d36982faca72ff3ca7f9942c62ab6f4cce9d"; + libraryHaskellDepends = [ base uhc-util uulib ]; + homepage = "https://github.com/atzedijkstra/delimiter-separated"; + description = "Library for dealing with tab and/or comma (or other) separated files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "delta" = callPackage ({ mkDerivation, base, containers, directory, filepath, hspec , optparse-applicative, process, sodium, time @@ -58900,7 +58975,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-haddock" = callPackage + "diagrams-haddock_0_3_0_7" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring , Cabal, cautious-file, cmdargs, containers, cpphs , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath @@ -58931,9 +59006,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-haddock_0_3_0_9" = callPackage + "diagrams-haddock" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring , Cabal, cautious-file, cmdargs, containers, cpphs , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath @@ -58963,7 +59039,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -63889,6 +63964,7 @@ self: { homepage = "https://github.com/fabianbergmark/ECMA-262"; description = "A ECMA-262 interpreter library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ecu" = callPackage @@ -65847,6 +65923,7 @@ self: { homepage = "https://github.com/sboosali/enumerate"; description = "enumerate all the values in a finite type (automatically)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enumeration" = callPackage @@ -67141,7 +67218,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "event" = callPackage + "event_0_1_2_1" = callPackage ({ mkDerivation, base, containers, semigroups, transformers }: mkDerivation { pname = "event"; @@ -67152,6 +67229,20 @@ self: { ]; description = "Monoidal, monadic and first-class events"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "event" = callPackage + ({ mkDerivation, base, containers, semigroups, transformers }: + mkDerivation { + pname = "event"; + version = "0.1.3"; + sha256 = "5968eb8c2bac404b48a6e18a110465a21198791fd187740f160f43459b52525a"; + libraryHaskellDepends = [ + base containers semigroups transformers + ]; + description = "Monoidal, monadic and first-class events"; + license = stdenv.lib.licenses.bsd3; }) {}; "event-driven" = callPackage @@ -67241,8 +67332,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.9.1.0"; - sha256 = "662ce1e2e74b88f27909b8abffae0944023c285202ba670ad2f9297e7c2e1a53"; + version = "0.9.1.1"; + sha256 = "0b14aa08ac3e26d4db103c18fe7c95758168f7a3aaad9387b54b83e981f4bbff"; libraryHaskellDepends = [ aeson async attoparsec base bytestring cereal containers network protobuf random stm text time unordered-containers uuid @@ -67320,28 +67411,15 @@ self: { }) {}; "exact-pi" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "exact-pi"; - version = "0.2.1.2"; - sha256 = "a6a6239cf13b18409996bad40c487b80fdf03b87fea48bb0309e32e47243ee38"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/dmcclean/exact-pi"; - description = "Exact rational multiples of pi (and integer powers of pi)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "exact-pi_0_4_0_0" = callPackage ({ mkDerivation, base, numtype-dk }: mkDerivation { pname = "exact-pi"; - version = "0.4.0.0"; - sha256 = "4d0e5742b4591b0458cd0396f186c88d9679fb80b53c918a69d3e359cd71acfd"; + version = "0.4.1.0"; + sha256 = "ccee78d83c51a837613ba52af2e1aa1fb3be1366691eb156d450a1ac8a9343b9"; libraryHaskellDepends = [ base numtype-dk ]; homepage = "https://github.com/dmcclean/exact-pi"; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-real" = callPackage @@ -67351,9 +67429,9 @@ self: { }: mkDerivation { pname = "exact-real"; - version = "0.11.3"; - sha256 = "0a1cd3676e1b814c1aa9d75388e0f14a4edd4c547ad8e63ca33f0ca72f588322"; - libraryHaskellDepends = [ base integer-gmp memoize ]; + version = "0.12.0"; + sha256 = "fcfdaeef23074efc26c49894c12b147a7eda32bd82af607147b0dc140119d938"; + libraryHaskellDepends = [ base integer-gmp memoize random ]; testHaskellDepends = [ base checkers directory doctest filepath groups QuickCheck random tasty tasty-hunit tasty-quickcheck tasty-th @@ -67693,6 +67771,7 @@ self: { version = "0.1.1"; sha256 = "ed8e30b2671102878767f275304e10d584b6e6e2e42fb179b5514b54dfc67147"; libraryHaskellDepends = [ base constraints singletons ]; + jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -67707,6 +67786,7 @@ self: { libraryHaskellDepends = [ aeson base constraints exinst singletons ]; + jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `aeson` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -67721,6 +67801,7 @@ self: { libraryHaskellDepends = [ base bytes constraints exinst singletons ]; + jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `bytes` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -67733,6 +67814,7 @@ self: { version = "0.1"; sha256 = "ea7e155a3a09064f65c39cd5e4323a64b8bf8dc4aa32de33b3495207315c361d"; libraryHaskellDepends = [ base constraints deepseq exinst ]; + jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `deepseq` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -67747,6 +67829,7 @@ self: { libraryHaskellDepends = [ base constraints exinst hashable singletons ]; + jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `hashable` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -68267,6 +68350,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extract-dependencies" = callPackage + ({ mkDerivation, async, base, Cabal, containers + , package-description-remote + }: + mkDerivation { + pname = "extract-dependencies"; + version = "0.1.0.0"; + sha256 = "e13363fb87dd5d893d421619d2feab7a84167e1c3fa66aa105f320fd3e95d9e3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base Cabal containers package-description-remote + ]; + executableHaskellDepends = [ + async base Cabal containers package-description-remote + ]; + homepage = "https://github.com/yamadapc/stack-run-auto/extract-dependencies"; + description = "Given a hackage package outputs the list of its dependencies"; + license = stdenv.lib.licenses.mit; + }) {}; + "extractelf" = callPackage ({ mkDerivation, base, bytestring, bytestring-mmap, directory, elf , filepath, optparse-applicative @@ -68486,6 +68590,7 @@ self: { homepage = "https://github.com/Taneb/family-tree"; description = "A family tree library for the Haskell programming language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "farmhash" = callPackage @@ -70543,6 +70648,29 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "file-modules" = callPackage + ({ mkDerivation, async, base, directory, filepath, haskell-src-exts + , MissingH + }: + mkDerivation { + pname = "file-modules"; + version = "0.1.2.2"; + sha256 = "c795b80add210cba9f8aee32a4b5c13fa5c9059763b7e127975fde734a6cb306"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base directory filepath haskell-src-exts MissingH + ]; + executableHaskellDepends = [ + async base directory filepath haskell-src-exts MissingH + ]; + jailbreak = true; + homepage = "https://github.com/yamadapc/stack-run-auto"; + description = "Takes a Haskell source-code file and outputs its modules"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filecache" = callPackage ({ mkDerivation, base, directory, exceptions, hashable, hinotify , lens, mtl, stm, strict-base-types, temporary @@ -73318,6 +73446,7 @@ self: { algebraic-classes base comonad constraints template-haskell transformers void ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Provides free functors that are adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; @@ -75818,6 +75947,7 @@ self: { homepage = "https://github.com/domdere/hs-geojson"; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geom2d" = callPackage @@ -76334,8 +76464,8 @@ self: { pname = "ghc-mod"; version = "5.4.0.0"; sha256 = "736652a2f63f9e8625c859c94f193ad8ac9f8fe793bbee672b65576309bfb069"; - revision = "3"; - editedCabalFile = "f6a778dfd7c503544c63dc8967848939d08c5e5adb491e05204fc0c1d1b5ce3d"; + revision = "4"; + editedCabalFile = "696785aa6bf4878359c6d004ed9c18fd77f3e883eeec55cdc86a07ce18b1a4b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76534,8 +76664,8 @@ self: { }: mkDerivation { pname = "ghc-simple"; - version = "0.2.1"; - sha256 = "f8d471879c3b89dba9849896aff24c96dc2ad4f22e5f835d3f89929a2886c1a5"; + version = "0.3"; + sha256 = "937833e77e0468bd546fc0ff7a1ec6d8d3ea1ee775cc5fe8b06373daf58f208c"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc ghc-paths ]; @@ -77722,25 +77852,52 @@ self: { }) {}; "git-fmt" = callPackage - ({ mkDerivation, aeson, base, directory, exceptions, extra - , fast-logger, filepath, monad-logger, monad-parallel, mtl - , optparse-applicative, process, temporary, text, time - , transformers, unordered-containers, yaml + ({ mkDerivation, aeson, base, exceptions, extra, fast-logger + , filepath, monad-logger, monad-parallel, mtl, optparse-applicative + , pipes, pipes-concurrency, temporary, text, time + , unordered-containers, yaml }: mkDerivation { pname = "git-fmt"; - version = "0.2.2.0"; - sha256 = "8a9036b1171c3db20992dd93b18da4f844bb7981a12194bc58da4ccb669e64fc"; + version = "0.3.0.2"; + sha256 = "acfad93d49bc3a964bda95907e5b3302b4ecaccd7c4b5f8c835866551654d6c0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base directory exceptions extra filepath monad-logger - monad-parallel mtl optparse-applicative process temporary text - transformers unordered-containers yaml + aeson base extra filepath monad-logger mtl pipes text + unordered-containers yaml ]; executableHaskellDepends = [ - base extra fast-logger monad-logger monad-parallel - optparse-applicative text time + base exceptions extra fast-logger filepath monad-logger + monad-parallel mtl optparse-applicative pipes pipes-concurrency + temporary text time + ]; + homepage = "https://github.com/hjwylde/git-fmt"; + description = "Custom git command for formatting code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "git-fmt_0_3_1_0" = callPackage + ({ mkDerivation, aeson, base, exceptions, extra, fast-logger + , filepath, monad-logger, monad-parallel, mtl, optparse-applicative + , pipes, pipes-concurrency, temporary, text, time + , unordered-containers, yaml + }: + mkDerivation { + pname = "git-fmt"; + version = "0.3.1.0"; + sha256 = "9342baf14ec7e0b4dbeb919fdf33588860ecf9ca706297e9601a055483e54ae2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base extra filepath monad-logger mtl pipes text + unordered-containers yaml + ]; + executableHaskellDepends = [ + base exceptions extra fast-logger filepath monad-logger + monad-parallel mtl optparse-applicative pipes pipes-concurrency + temporary text time ]; homepage = "https://github.com/hjwylde/git-fmt"; description = "Custom git command for formatting code"; @@ -82704,7 +82861,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gtk2hs-buildtools" = callPackage + "gtk2hs-buildtools_0_13_0_4" = callPackage ({ mkDerivation, alex, array, base, containers, directory, filepath , happy, hashtables, pretty, process, random }: @@ -82722,6 +82879,27 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Tools to build the Gtk2Hs suite of User Interface libraries"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gtk2hs-buildtools" = callPackage + ({ mkDerivation, alex, array, base, containers, directory, filepath + , happy, hashtables, pretty, process, random + }: + mkDerivation { + pname = "gtk2hs-buildtools"; + version = "0.13.0.5"; + sha256 = "d95811a505ec10e4c82f3ca81c06b317eb9d345e73b6eda7aeaebd1e868f0a93"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base containers directory filepath hashtables pretty process + random + ]; + executableToolDepends = [ alex happy ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Tools to build the Gtk2Hs suite of User Interface libraries"; + license = stdenv.lib.licenses.gpl2; }) {}; "gtk2hs-cast-glade" = callPackage @@ -84402,8 +84580,8 @@ self: { pname = "hackage-mirror"; version = "0.1.0.0"; sha256 = "6f638b9ca0698edaa6d3a4e11ccdd2447299b9ba89a1aef494d9694a6ceb4ac5"; - revision = "1"; - editedCabalFile = "848ea26073e706a9303ec1baf811a74b65859ae649731a3b799b4fb8c558c1bc"; + revision = "2"; + editedCabalFile = "d785ec52af5065a15f693ef3f171b7a8508b75d8558ac1bfd68e726c8dfbe90d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87553,8 +87731,8 @@ self: { }: mkDerivation { pname = "hashabler"; - version = "1.1"; - sha256 = "93944c783631977f3927db9b3888012325f72c5e4d90fba24055f4e3cc5ffaeb"; + version = "1.2.1"; + sha256 = "dbe4b8698748642afe6441b533fcde55d2c467557a86fe47700544841c4f13f5"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp primitive template-haskell text @@ -87587,9 +87765,10 @@ self: { ({ mkDerivation, base, bytestring, containers, split }: mkDerivation { pname = "hashids"; - version = "1.0.2.1"; - sha256 = "5f4487e0fc95d835dfceb621323cee1ecaf4d534d0e6d85665d6131e3b73000f"; + version = "1.0.2.2"; + sha256 = "989d7d1f50738c664230629b3e43340c929d5995ab978837748a5cc22aaaf308"; libraryHaskellDepends = [ base bytestring containers split ]; + testHaskellDepends = [ base bytestring containers split ]; homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; @@ -88788,13 +88967,14 @@ self: { pname = "haskell-src-exts"; version = "1.17.0"; sha256 = "398f668f690a7a766c7338b82d241581ff6dfbd9aa166712911535ebd3f03122"; + revision = "1"; + editedCabalFile = "ca48ccd93dd2abf02c84a35eefb88402442c45eaa45524dce1f7396ec334e31c"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ base containers directory filepath mtl pretty-show smallcheck syb tasty tasty-golden tasty-smallcheck ]; - jailbreak = true; homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; @@ -88956,8 +89136,8 @@ self: { }: mkDerivation { pname = "haskell-tor"; - version = "0.1.0.0"; - sha256 = "bcbd1153f1181d57ea5e6d6e641b7aece40be75655b0e8638fda74807843dcca"; + version = "0.1.1"; + sha256 = "7d6a46a46c04d6c2fcfbaaf8fc080edff2b51c719ad0882c467c787b9f392774"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88979,6 +89159,7 @@ self: { homepage = "http://github.com/GaloisInc/haskell-tor"; description = "A Haskell Tor Node"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-type-exts" = callPackage @@ -89782,6 +89963,7 @@ self: { homepage = "http://github.com/haskoin/haskoin"; description = "Implementation of the core Bitcoin protocol features"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin-crypto" = callPackage @@ -89837,6 +90019,7 @@ self: { homepage = "http://github.com/haskoin/haskoin"; description = "Implementation of a Bitoin node"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin-protocol" = callPackage @@ -90404,6 +90587,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_14_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , contravariant, contravariant-extras, data-default-class, dlist + , either, hashable, hashtables, loch-th, placeholders + , postgresql-binary, postgresql-libpq, profunctors, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.14.0.2"; + sha256 = "b07aa754eb948c56b99f0cee5c360a3bf5566bba3cc2d429f329d6ad52184193"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring contravariant + contravariant-extras data-default-class dlist either hashable + hashtables loch-th placeholders postgresql-binary postgresql-libpq + profunctors scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + data-default-class dlist either hashable profunctors QuickCheck + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text time transformers uuid vector + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "A very efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend_0_2_1" = callPackage ({ mkDerivation, base, base-prelude, bytestring, list-t, text , vector @@ -90944,34 +91159,29 @@ self: { "haste-compiler" = callPackage ({ mkDerivation, array, base, bin-package-db, binary, blaze-builder , bytestring, bzlib, Cabal, containers, data-binary-ieee754 - , data-default, directory, either, filepath, ghc, ghc-paths - , ghc-prim, ghc-simple, HTTP, monads-tf, mtl, network, network-uri - , process, random, shellmate, system-fileio, tar, terminfo - , transformers, unix, utf8-string, websockets + , directory, either, filepath, ghc, ghc-paths, ghc-prim, ghc-simple + , HTTP, monads-tf, mtl, network, network-uri, process, random + , shellmate, system-fileio, tar, terminfo, transformers, unix + , utf8-string, websockets }: mkDerivation { pname = "haste-compiler"; - version = "0.5.2"; - sha256 = "26e5d5961717e1a9f1d2a41475f9d40ac180bba3eea0ee90e003420fe6fd7c54"; - revision = "2"; - editedCabalFile = "726a9e31dbb59233cfbdb4fb230be6d38ec7333a850c063121bf75ad25e959ca"; + version = "0.5.3"; + sha256 = "20e955b97d731aafc404bb1560d47050944530c655acd7eb80e1d4a8468dfcc7"; configureFlags = [ "-fportable" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 data-default - directory filepath ghc ghc-paths ghc-prim monads-tf network - network-uri process random shellmate transformers utf8-string - websockets + base binary bytestring containers data-binary-ieee754 directory + filepath ghc ghc-paths ghc-prim monads-tf network network-uri + process random shellmate transformers utf8-string websockets ]; executableHaskellDepends = [ array base bin-package-db binary blaze-builder bytestring bzlib - Cabal containers data-default directory either filepath ghc - ghc-paths ghc-prim ghc-simple HTTP mtl network network-uri process - random shellmate system-fileio tar terminfo transformers unix - utf8-string + Cabal containers directory either filepath ghc ghc-paths ghc-prim + ghc-simple HTTP mtl network network-uri process random shellmate + system-fileio tar terminfo transformers unix utf8-string ]; - jailbreak = true; homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; @@ -91185,25 +91395,25 @@ self: { "haxl" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, filepath, hashable, HUnit, pretty, text, time - , unordered-containers, vector + , directory, exceptions, filepath, hashable, HUnit, pretty, text + , time, unordered-containers, vector }: mkDerivation { pname = "haxl"; - version = "0.3.0.0"; - sha256 = "0b2c1e6fc052a665ef6faef14ed38d0732c281a8cd7abb3fa99957955e09378b"; + version = "0.3.1.0"; + sha256 = "fba961b0f3a9a9b6f7cf6ac24689d48fb8404d79ec86a36c2784f3f45d06669a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory filepath - hashable HUnit pretty text time unordered-containers vector + aeson base bytestring containers deepseq directory exceptions + filepath hashable HUnit pretty text time unordered-containers + vector ]; executableHaskellDepends = [ base hashable time ]; testHaskellDepends = [ aeson base bytestring containers hashable HUnit text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/facebook/Haxl"; description = "A Haskell library for efficient, concurrent, and concise data access"; license = stdenv.lib.licenses.bsd3; @@ -99341,14 +99551,16 @@ self: { }) {}; "hpp" = callPackage - ({ mkDerivation, base, directory, filepath, time }: + ({ mkDerivation, base, directory, filepath, time, transformers }: mkDerivation { pname = "hpp"; - version = "0.1.0.0"; - sha256 = "f1c2645cb7ee681bf1d6a02ea0f98c3fc2fe880fd408ff3dd1870d817197d736"; + version = "0.3.0.0"; + sha256 = "315ae6e38a713c1ba914416cd22f271508e981c763ed52701aa71f1be262aae4"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base directory filepath time ]; + libraryHaskellDepends = [ + base directory filepath time transformers + ]; executableHaskellDepends = [ base directory filepath time ]; homepage = "https://github.com/acowley/hpp"; description = "A Haskell pre-processor"; @@ -101543,6 +101755,7 @@ self: { jailbreak = true; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsini" = callPackage @@ -104198,6 +104411,7 @@ self: { homepage = "http://github.com/kylcarte/html-rules/"; description = "Perform traversals of HTML structures using sets of rules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html-tokenizer" = callPackage @@ -106272,14 +106486,15 @@ self: { }) {inherit (pkgs) ruby;}; "huckleberry" = callPackage - ({ mkDerivation, base, bytestring, mtl, serialport }: + ({ mkDerivation, base, bytestring, HUnit, mtl, serialport }: mkDerivation { pname = "huckleberry"; - version = "0.9.0.0"; - sha256 = "fbd6c4f74638987ef55f924410f42ac8a4d3782423b43c36f09c9f901a6747cb"; + version = "0.9.0.1"; + sha256 = "14cc07a372980fbd9a04fb20c24aab4098619b9555dfec40e9a00eced31e7578"; libraryHaskellDepends = [ base bytestring mtl serialport ]; + testHaskellDepends = [ base HUnit ]; jailbreak = true; - description = "haskell EDSL Huckleberry"; + description = "IchigoJam BASIC expressed in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -108154,13 +108369,12 @@ self: { }: mkDerivation { pname = "iban"; - version = "0.1.1.0"; - sha256 = "749bd4d714742bfaedca1bc7b60f3292138dc4a7541a9fdc2762d8a29580e465"; + version = "0.1.1.1"; + sha256 = "e9e2ef69259edb58988ab147fbd71d75f7c1a1015220e40cca4e1c68d5fc9c91"; libraryHaskellDepends = [ base containers iso3166-country-codes text unordered-containers ]; testHaskellDepends = [ base HUnit tasty tasty-hunit text ]; - jailbreak = true; homepage = "https://github.com/ibotty/iban"; description = "Validate and generate IBANs"; license = stdenv.lib.licenses.bsd3; @@ -110148,6 +110362,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "inf-interval" = callPackage + ({ mkDerivation, array, base, deepseq, vector }: + mkDerivation { + pname = "inf-interval"; + version = "0.1.0.0"; + sha256 = "817494d30f229c50dd47b501bfa832bf873f1b90ccdeba844cc50445f0c8791b"; + libraryHaskellDepends = [ array base deepseq vector ]; + jailbreak = true; + homepage = "https://github.com/RaminHAL9001/inf-interval"; + description = "Non-contiguous interval data types with potentially infinite ranges"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "infer-upstream" = callPackage ({ mkDerivation, ansi-wl-pprint, base, github, optparse-applicative , parsec, process, text @@ -116918,8 +117145,8 @@ self: { }: mkDerivation { pname = "lambdacube-gl"; - version = "0.2.0"; - sha256 = "a07c0a8030275593722975cbfafb3dbee0834cf1e65e173a3f686ee7ef7e46e4"; + version = "0.2.2"; + sha256 = "bee622839c09a05fdab01fb88c15680eb0cc0feda1a580ddb81fa2cbbefa1d28"; libraryHaskellDepends = [ base binary bitmap bytestring bytestring-trie containers lambdacube-core lambdacube-edsl language-glsl mtl OpenGLRaw @@ -117619,7 +117846,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-java" = callPackage + "language-java_0_2_7" = callPackage ({ mkDerivation, alex, array, base, cpphs, directory, filepath , HUnit, mtl, parsec, pretty, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -117639,6 +117866,28 @@ self: { homepage = "http://github.com/vincenthz/language-java"; description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "language-java" = callPackage + ({ mkDerivation, alex, array, base, cpphs, directory, filepath + , HUnit, mtl, parsec, pretty, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "language-java"; + version = "0.2.8"; + sha256 = "0b789e089e4b18bf6248c2a1a9f3eff23cc19548899899f912597a1c33e9c367"; + libraryHaskellDepends = [ array base cpphs parsec pretty ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + base directory filepath HUnit mtl QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + doCheck = false; + homepage = "http://github.com/vincenthz/language-java"; + description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; }) {}; "language-java-classfile" = callPackage @@ -117786,8 +118035,8 @@ self: { }: mkDerivation { pname = "language-lua"; - version = "0.8.0"; - sha256 = "cad8b47b43b66082d8f22f9658620275e6c2edb4714c2f83eed115309c7003ab"; + version = "0.8.1"; + sha256 = "e6adaf71da11914ebb68094dd3e441134343f9fa821585de8fa72343005f1028"; libraryHaskellDepends = [ array base bytestring deepseq mtl parsec ]; @@ -119404,8 +119653,8 @@ self: { ({ mkDerivation, base, doctest, lens }: mkDerivation { pname = "lens-tutorial"; - version = "1.0.0"; - sha256 = "469df18e1614b8eeeab121a67fd27b79ae7cb8b8386a18539a266841e957a1c9"; + version = "1.0.1"; + sha256 = "66494550d66d4c62ea56d0184d118e302d3f1f12505c5c7c0a00e098e77272ab"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base doctest ]; description = "Tutorial for the lens library"; @@ -119925,6 +120174,7 @@ self: { homepage = "http://maartenfaddegon.nl"; description = "Store and manipulate data in a graph"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libhbb" = callPackage @@ -120476,6 +120726,30 @@ self: { async base HUnit lifted-base monad-control mtl tasty tasty-hunit tasty-th ]; + jailbreak = true; + homepage = "https://github.com/maoe/lifted-async"; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lifted-async_0_7_0_1" = callPackage + ({ mkDerivation, async, base, constraints, HUnit, lifted-base + , monad-control, mtl, tasty, tasty-hunit, tasty-th + , transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.7.0.1"; + sha256 = "c3235d0f4a90baba3217269562bee655c6d9c538e2b57b6c5b23da4ef1bb6e6a"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty tasty-hunit + tasty-th + ]; + jailbreak = true; homepage = "https://github.com/maoe/lifted-async"; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; @@ -120489,8 +120763,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.7.0.1"; - sha256 = "c3235d0f4a90baba3217269562bee655c6d9c538e2b57b6c5b23da4ef1bb6e6a"; + version = "0.7.0.2"; + sha256 = "0e8a97500b5cb387c711e8dc0db27a07b61d21d610ba8aebf4cae5f92920b7ac"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -123140,6 +123414,7 @@ self: { base constraints MonadRandom QuickCheck repa test-framework test-framework-quickcheck2 time type-natural vector ]; + jailbreak = true; homepage = "https://github.com/cpeikert/Lol"; description = "A library for lattice cryptography"; license = stdenv.lib.licenses.gpl2; @@ -123828,8 +124103,8 @@ self: { }: mkDerivation { pname = "luminance"; - version = "0.7"; - sha256 = "1c93e98032e678b5066de177fa4a423a2248eba837cde75668c2a7acaec49e21"; + version = "0.7.1"; + sha256 = "36aabb520ede1cd9dfe6e6c5dc6a45d21c06500e1fdf66ce497e3081d27d56a0"; libraryHaskellDepends = [ base containers contravariant dlist gl linear mtl resourcet semigroups transformers vector void @@ -123876,14 +124151,13 @@ self: { }) {}; "luthor" = callPackage - ({ mkDerivation, base, mtl, parsec }: + ({ mkDerivation, base, mtl, parsec, transformers }: mkDerivation { pname = "luthor"; - version = "0.0.1"; - sha256 = "222851a4415a8ea6172c0b87de20183c5c2946003736807d2bd6d8c6ee647308"; - libraryHaskellDepends = [ base mtl parsec ]; + version = "0.0.2"; + sha256 = "ca2f1f9689b17d1799c11a307f41a68ff023775cebb84b04b838936dd32dcde2"; + libraryHaskellDepends = [ base mtl parsec transformers ]; testHaskellDepends = [ base mtl parsec ]; - jailbreak = true; homepage = "https://github.com/Zankoku-Okuno/luthor"; description = "Tools for lexing and utilizing lexemes that integrate with Parsec"; license = stdenv.lib.licenses.bsd3; @@ -126068,7 +126342,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {eng = null; mat = null; mx = null;}; - "matrices" = callPackage + "matrices_0_4_2" = callPackage ({ mkDerivation, base, primitive, tasty, tasty-hunit , tasty-quickcheck, vector }: @@ -126084,6 +126358,23 @@ self: { ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "matrices" = callPackage + ({ mkDerivation, base, primitive, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "matrices"; + version = "0.4.3"; + sha256 = "7bc65e57db63146824e8b840f72ce0980251337b98819148439b1afe8d0d4039"; + libraryHaskellDepends = [ base primitive vector ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck vector + ]; + description = "native matrix based on vector"; + license = stdenv.lib.licenses.bsd3; }) {}; "matrix_0_3_4_0" = callPackage @@ -126442,6 +126733,25 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "mdapi" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, lens + , lens-aeson, text, transformers, wreq + }: + mkDerivation { + pname = "mdapi"; + version = "1"; + sha256 = "0f0c90b50b439519ce86d721023e06478358b94c5339f8e3dfdf930ad6b16721"; + revision = "1"; + editedCabalFile = "23b50bbb40d56c56dd89e5d0d36b62c7c31e9c0046362a56dfcab3c81a753139"; + libraryHaskellDepends = [ + aeson base bytestring data-default lens lens-aeson text + transformers wreq + ]; + homepage = "https://github.com/relrod/mdapi-hs"; + description = "Haskell interface to Fedora's mdapi"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "mdcat" = callPackage ({ mkDerivation, ansi-terminal, base, directory, pandoc, terminfo }: @@ -126587,6 +126897,7 @@ self: { ]; description = "A silly container"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mega-sdist" = callPackage @@ -128154,6 +128465,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "minilens" = callPackage + ({ mkDerivation, array, base, containers, mtl, transformers }: + mkDerivation { + pname = "minilens"; + version = "0.1.0.1"; + sha256 = "b259c6a9b7c799e2fea350d41f0c4d7aa19fcef74fae9bc2db70ac81d454e285"; + libraryHaskellDepends = [ array base containers mtl transformers ]; + jailbreak = true; + homepage = "https://github.com/RaminHAL9001/minilens"; + description = "A minimalistic lens library, providing only the simplest, most basic lens functionality"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "minimal-configuration" = callPackage ({ mkDerivation, base, containers, directory, filepath, tconfig }: mkDerivation { @@ -138530,17 +138854,16 @@ self: { }) {}; "optimization" = callPackage - ({ mkDerivation, ad, base, directory, distributive, doctest - , filepath, linear, semigroupoids, vector + ({ mkDerivation, ad, base, distributive, linear, semigroupoids + , vector }: mkDerivation { pname = "optimization"; - version = "0.1.6"; - sha256 = "9e76e23acdd2c17aa53c68ad7540fe1cea0b1315046f88b1e2c05422b4e44da0"; + version = "0.1.7"; + sha256 = "166af247883dab29171440bb97e3fd836fb66a5f4d0133fee0c96e6c120489f8"; libraryHaskellDepends = [ ad base distributive linear semigroupoids vector ]; - testHaskellDepends = [ base directory doctest filepath ]; jailbreak = true; homepage = "http://github.com/bgamari/optimization"; description = "Numerical optimization"; @@ -139183,6 +139506,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "package-description-remote" = callPackage + ({ mkDerivation, base, bytestring, Cabal, lens, lens-aeson, wreq }: + mkDerivation { + pname = "package-description-remote"; + version = "0.2.0.0"; + sha256 = "4a936d2346265d4d960875b12272e9f15aedf6aa6aa5f177f7ce30c7e4f68744"; + libraryHaskellDepends = [ + base bytestring Cabal lens lens-aeson wreq + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/yamadapc/stack-run-auto/package-description-remote"; + description = "Fetches a 'GenericPackageDescription' from Hackage"; + license = stdenv.lib.licenses.mit; + }) {}; + "package-o-tron" = callPackage ({ mkDerivation, base, Cabal, filemanip, filepath, groom, packdeps , process @@ -139224,8 +139562,8 @@ self: { }: mkDerivation { pname = "packdeps"; - version = "0.4.1"; - sha256 = "c43f878515ecf1e972f683a2671ed941e4389fab4920e68527f8015572a04e36"; + version = "0.4.2"; + sha256 = "ce07300998bb107c343df8afff03e88398d4ad69b0fd10cb8777f11746123e40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140773,7 +141111,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "parseargs" = callPackage + "parseargs_0_1_5_2" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "parseargs"; @@ -140786,6 +141124,22 @@ self: { homepage = "http://github.com/BartMassey/parseargs"; description = "Command-line argument parsing library for Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "parseargs" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "parseargs"; + version = "0.2.0.3"; + sha256 = "252276e93adc941218220891a82a7b6622eacf829eda8b753c476fb13ece0073"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base ]; + homepage = "http://github.com/BartMassey/parseargs"; + description = "Full-featured command-line argument parsing library"; + license = stdenv.lib.licenses.bsd3; }) {}; "parsec_3_1_7" = callPackage @@ -145366,8 +145720,8 @@ self: { }: mkDerivation { pname = "pipes-csv"; - version = "1.4.2"; - sha256 = "eacd20547f7d9d7efc8424cebeae424d7abe2c851ae192a21d6c99516ff787ce"; + version = "1.4.3"; + sha256 = "9485f5ddd56ec9bb10d26cdf2b5b67754726e36b167652b11cb0a42acbda68b3"; libraryHaskellDepends = [ base blaze-builder bytestring cassava pipes unordered-containers vector @@ -145733,8 +146087,8 @@ self: { }: mkDerivation { pname = "pipes-shell"; - version = "0.1.3"; - sha256 = "611389f6b81ef99765cd17226c33689035d7ed7f848402a8bf485b11068d8970"; + version = "0.1.4"; + sha256 = "05d31328239853915e18020e952c487cb9edf8027d52ad81f284930339d3ada4"; libraryHaskellDepends = [ async base bytestring pipes pipes-bytestring pipes-safe process stm stm-chans text @@ -145743,7 +146097,6 @@ self: { async base bytestring directory hspec pipes pipes-bytestring pipes-safe process stm stm-chans text ]; - jailbreak = true; description = "Create proper Pipes from System.Process"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -147597,6 +147950,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_7_4" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , either, foldl, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.7.4"; + sha256 = "12dde34bc686374b3c96dffd37e579e5fd3edd12bc7e1c9f7fa626225607ece8"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + placeholders scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + base base-prelude bytestring conversion conversion-bytestring + conversion-text either loch-th placeholders postgresql-libpq + QuickCheck quickcheck-instances scientific tasty tasty-hunit + tasty-quickcheck tasty-smallcheck text time transformers uuid + vector + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-config" = callPackage ({ mkDerivation, aeson, base, bytestring, monad-control, mtl , postgresql-simple, resource-pool, time @@ -153813,6 +154196,7 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bliplib parseargs ]; + jailbreak = true; homepage = "https://github.com/bjpop/blip"; description = "Read and pretty print Python bytecode (.pyc) files."; license = stdenv.lib.licenses.bsd3; @@ -154639,17 +155023,17 @@ self: { "reflex-dom-contrib" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers - , data-default, ghcjs-dom, http-types, lens, mtl, readable, reflex - , reflex-dom, safe, string-conv, text, time + , data-default, ghcjs-dom, http-types, lens, mtl, random, readable + , reflex, reflex-dom, safe, string-conv, text, time, transformers }: mkDerivation { pname = "reflex-dom-contrib"; - version = "0.2"; - sha256 = "82a6b1ade13773dc0ed573d4086f75c15971e416f1b11e1d7141b7fc4079ecc5"; + version = "0.3"; + sha256 = "a5d7d60dbd3d752111e0d3517c3c25e62ddaae30ca5ae61278d9c8ef9997d733"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default ghcjs-dom - http-types lens mtl readable reflex reflex-dom safe string-conv - text time + http-types lens mtl random readable reflex reflex-dom safe + string-conv text time transformers ]; jailbreak = true; homepage = "https://github.com/reflex-frp/reflex-dom-contrib"; @@ -156960,7 +157344,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rest-client" = callPackage + "rest-client_0_5_0_3" = callPackage ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive , data-default, exceptions, http-conduit, http-types, hxt , hxt-pickle-utils, monad-control, mtl, resourcet, rest-types @@ -156981,6 +157365,28 @@ self: { ]; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rest-client" = callPackage + ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive + , data-default, exceptions, http-conduit, http-types, hxt + , hxt-pickle-utils, monad-control, mtl, resourcet, rest-types + , tostring, transformers, transformers-base, transformers-compat + , uri-encode, utf8-string + }: + mkDerivation { + pname = "rest-client"; + version = "0.5.0.4"; + sha256 = "52d48ea8ce25e0b854f0078f14b1a81663ec982b3a831a0c372b6b8ab09e1625"; + libraryHaskellDepends = [ + aeson-utils base bytestring case-insensitive data-default + exceptions http-conduit http-types hxt hxt-pickle-utils + monad-control mtl resourcet rest-types tostring transformers + transformers-base transformers-compat uri-encode utf8-string + ]; + description = "Utility library for use in generated API client libraries"; + license = stdenv.lib.licenses.bsd3; }) {}; "rest-core_0_33_1_2" = callPackage @@ -157503,10 +157909,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.19.0.0"; - sha256 = "dc8b6e65acedd598a6592c5b0e92ef0f722b87c01af5c64b6caa30da4318840b"; - revision = "1"; - editedCabalFile = "457cc4689cb424f1899fe05b0fbbf254bda408e2fbe6f412581add5c26f4bac1"; + version = "0.19.0.1"; + sha256 = "556762e3ce87c092d8e5982e86ab9b4319d069b157e613d5e99f67120e8357c0"; libraryHaskellDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -158694,8 +159098,8 @@ self: { }: mkDerivation { pname = "rncryptor"; - version = "0.0.2.1"; - sha256 = "b59031102f0b5f441b64fc532bcc3a1466b9d35e7789d80a4689827ed6c1cc20"; + version = "0.0.2.3"; + sha256 = "465879f9e1209050820f939229ebea727d736071e46a19ea775aba8e0608e69f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158707,7 +159111,6 @@ self: { testHaskellDepends = [ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; description = "Haskell implementation of the RNCryptor file format"; license = stdenv.lib.licenses.mit; }) {}; @@ -159026,6 +159429,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rose-trie" = callPackage + ({ mkDerivation, base, containers, deepseq, minilens, mtl + , transformers + }: + mkDerivation { + pname = "rose-trie"; + version = "0.1.0.0"; + sha256 = "f22b4fa41ff69462fbeb551a4bbc92faf26a1ab3910768a9fe75889d4f01ef69"; + libraryHaskellDepends = [ + base containers deepseq minilens mtl transformers + ]; + jailbreak = true; + homepage = "https://github.com/RaminHAL9001/rose-trie"; + description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures."; + license = stdenv.lib.licenses.gpl3; + }) {}; + "rosezipper" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -159988,15 +160408,15 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "safecopy_0_9_0" = callPackage + "safecopy_0_9_0_1" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , lens-action, old-time, quickcheck-instances, tasty , tasty-quickcheck, template-haskell, text, time, vector }: mkDerivation { pname = "safecopy"; - version = "0.9.0"; - sha256 = "e91de5fc0af2fe2cc8d4445eaee5f4b7bc8e46643dbae7dc6471d11a5b21f71b"; + version = "0.9.0.1"; + sha256 = "3fd178f6066cb5d0eedb7981bd39ffae34908d636c63d32d78aefe67dfe65031"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -162042,8 +162462,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.3"; - sha256 = "6cb6ecdf29b685dbcc3559f982c17d800e0f12efaed29d782c0e686b77211cf2"; + version = "0.1.0.4"; + sha256 = "b0df3045fb8bed0d8a902506524e165cc5e31cd9f05e21ac6d214cc90f42049c"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL @@ -165961,15 +166381,15 @@ self: { }) {}; "shellmate" = callPackage - ({ mkDerivation, base, bytestring, directory, download-curl, feed - , filepath, process, tagsoup, temporary, transformers, xml + ({ mkDerivation, base, bytestring, directory, feed, filepath, HTTP + , network-uri, process, tagsoup, temporary, transformers, xml }: mkDerivation { pname = "shellmate"; - version = "0.2.2"; - sha256 = "82a8da309108007d163d821dd644d37fe15a2cc3bd1885b0ed9a645997815b76"; + version = "0.2.3"; + sha256 = "a1769617a819289400a8be95a967d8873d196aad4f696396016ea4f7f65cdf65"; libraryHaskellDepends = [ - base bytestring directory download-curl feed filepath process + base bytestring directory feed filepath HTTP network-uri process tagsoup temporary transformers xml ]; homepage = "http://github.com/valderman/shellmate"; @@ -171268,6 +171688,7 @@ self: { executableHaskellDepends = [ base edit-distance parseargs phonetic-code sqlite ]; + jailbreak = true; homepage = "https://github.com/gregwebs/haskell-spell-suggest"; description = "Spelling suggestion tool with library and command-line interfaces"; license = stdenv.lib.licenses.bsd3; @@ -172679,6 +173100,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stack-run-auto" = callPackage + ({ mkDerivation, async, base, extract-dependencies, file-modules + , lens, lens-aeson, MissingH, process, stm-containers, text, time + , wreq + }: + mkDerivation { + pname = "stack-run-auto"; + version = "0.1.0.0"; + sha256 = "2233841a0e6fc3bf7fcf38d42899a7e9d89e3f0c3e02c3eda44279d1d711d0e0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base extract-dependencies file-modules lens lens-aeson + MissingH process stm-containers text time wreq + ]; + executableHaskellDepends = [ + async base extract-dependencies file-modules lens lens-aeson + MissingH process stm-containers text time wreq + ]; + testHaskellDepends = [ + async base extract-dependencies file-modules lens lens-aeson + MissingH process stm-containers text time wreq + ]; + homepage = "http://github.com/yamadapc/stack-run-auto#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stackage_0_3_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal , classy-prelude-conduit, conduit-extra, containers @@ -175142,17 +175592,15 @@ self: { "strict-base-types" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim - , lens, QuickCheck, strict + , hashable, lens, QuickCheck, strict }: mkDerivation { pname = "strict-base-types"; - version = "0.3.0"; - sha256 = "6beb0594468d462b7546dbbda2cd09c7ffacdcff36c2c43bc1789017bb47e30f"; - revision = "1"; - editedCabalFile = "fa53ac61b014f23c94e9016bdcef5f0ba853750f3faf2871f632507fc410d0f2"; + version = "0.4.0"; + sha256 = "5b9ac632f3128504b2619cc0e74ef6624e7b42a6a68f0a3758dd46937e172591"; libraryHaskellDepends = [ - aeson base bifunctors binary deepseq ghc-prim lens QuickCheck - strict + aeson base bifunctors binary deepseq ghc-prim hashable lens + QuickCheck strict ]; homepage = "https://github.com/meiersi/strict-base-types"; description = "Strict variants of the types provided in base"; @@ -176628,22 +177076,24 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, containers, hashable, hspec - , http-media, HUnit, lens, network, QuickCheck, template-haskell - , text, unordered-containers, vector + ({ mkDerivation, aeson, aeson-qq, base, containers, doctest, Glob + , hashable, hspec, http-media, HUnit, lens, network, QuickCheck + , scientific, template-haskell, text, time, unordered-containers + , vector }: mkDerivation { pname = "swagger2"; - version = "0.3"; - sha256 = "74109f1c1f67be44f86a4e7d181487b7fbffea275cf25ea37ad9967e74c6eef0"; + version = "0.4"; + sha256 = "3cb581abef4166b283cd90f86ca0159cf05573c9b7534470301248678f8d313c"; libraryHaskellDepends = [ - aeson base containers hashable http-media lens network - template-haskell text unordered-containers + aeson base containers hashable http-media lens network scientific + template-haskell text time unordered-containers ]; testHaskellDepends = [ - aeson aeson-qq base hspec HUnit QuickCheck text - unordered-containers vector + aeson aeson-qq base containers doctest Glob hspec HUnit QuickCheck + text unordered-containers vector ]; + doCheck = false; homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; @@ -178072,6 +178522,7 @@ self: { homepage = "http://github.com/ekmett/tables/"; description = "In-memory storage with multiple keys using lenses and traversals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tablestorage" = callPackage @@ -178911,8 +179362,8 @@ self: { }: mkDerivation { pname = "tasty"; - version = "0.11.0.1"; - sha256 = "7dca0b1f89e25911c4259fa45ace6c7048b700aa6d3fc5e10b4bf35a77bc0ab2"; + version = "0.11.0.2"; + sha256 = "3d87f99a046bfda752dcf558f36931135c784af9a2911a61bc4673199f933c63"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl optparse-applicative regex-tdfa-rc stm tagged unbounded-delays @@ -179034,7 +179485,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tasty-golden" = callPackage + "tasty-golden_2_3_0_2" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, mtl, optparse-applicative, process, tagged , tasty, tasty-hunit, temporary, temporary-rc @@ -179053,6 +179504,28 @@ self: { homepage = "https://github.com/feuerbach/tasty-golden"; description = "Golden tests support for tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tasty-golden" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, temporary-rc + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.1"; + sha256 = "f292a57dc63afdd5607cca82bcc5ad606c5e1c59bb6fabc7fe48a26d816dcbf1"; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary-rc + ]; + homepage = "https://github.com/feuerbach/tasty-golden"; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; }) {}; "tasty-hspec_1_1" = callPackage @@ -179392,7 +179865,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-smallcheck" = callPackage + "tasty-smallcheck_0_8_0_1" = callPackage ({ mkDerivation, async, base, smallcheck, tagged, tasty }: mkDerivation { pname = "tasty-smallcheck"; @@ -179402,6 +179875,19 @@ self: { homepage = "http://documentup.com/feuerbach/tasty"; description = "SmallCheck support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tasty-smallcheck" = callPackage + ({ mkDerivation, async, base, smallcheck, tagged, tasty }: + mkDerivation { + pname = "tasty-smallcheck"; + version = "0.8.1"; + sha256 = "314ba7acdb7793730e7677f553a72dd6a4a8f9a45ff3e931cd7d384affb3c6d8"; + libraryHaskellDepends = [ async base smallcheck tagged tasty ]; + homepage = "http://documentup.com/feuerbach/tasty"; + description = "SmallCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; }) {}; "tasty-tap" = callPackage @@ -182861,7 +183347,7 @@ self: { homepage = "https://github.com/nicta/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tictactoe3d" = callPackage @@ -183196,7 +183682,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time-locale-compat" = callPackage + "time-locale-compat_0_1_1_0" = callPackage ({ mkDerivation, base, time }: mkDerivation { pname = "time-locale-compat"; @@ -183206,6 +183692,19 @@ self: { homepage = "http://twitter.com/khibino/"; description = "Compatibility of TimeLocale between old-locale and time-1.5"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "time-locale-compat" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "time-locale-compat"; + version = "0.1.1.1"; + sha256 = "ced6a61e81671f266cc3daf7eee798e5355df8d82163e7e44dc0a51a47c50670"; + libraryHaskellDepends = [ base time ]; + homepage = "https://github.com/khibino/haskell-time-locale-compat"; + description = "Compatibility of TimeLocale between old-locale and time-1.5"; + license = stdenv.lib.licenses.bsd3; }) {}; "time-patterns" = callPackage @@ -185706,8 +186205,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "tuple-generic"; - version = "0.5.0.0"; - sha256 = "7c7d37f1e3c5f0927e4b4fa99fd6fd5846a893cf4d031d624b0f6cc52b8f7531"; + version = "0.6.0.0"; + sha256 = "b5bda11535fb03d224f79a7d6b8372ca356e3f35e8ec7c7b4bb4793d79fb9e0c"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/tuple-generic"; description = "Generic operations on tuples"; @@ -186864,6 +187363,7 @@ self: { base constraints equational-reasoning monomorphic singletons template-haskell ]; + jailbreak = true; homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; @@ -188794,15 +189294,16 @@ self: { }) {}; "uom-plugin" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, tasty - , tasty-hunit, template-haskell, units-parser + ({ mkDerivation, base, containers, deepseq, ghc + , ghc-tcplugins-extra, tasty, tasty-hunit, template-haskell + , units-parser }: mkDerivation { pname = "uom-plugin"; - version = "0.1.0.0"; - sha256 = "34c00b7e48152e654ae0dfeaf74a12c9fd037549489f2a13e7e9534994bb3a38"; + version = "0.1.1.0"; + sha256 = "3d019d48c8172bf17acb5d5562a5394731c301df655a24f521f60e49ebab2554"; libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra template-haskell + base containers deepseq ghc ghc-tcplugins-extra template-haskell units-parser ]; testHaskellDepends = [ base tasty tasty-hunit ]; @@ -189451,8 +189952,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.2.0"; - sha256 = "15ae15536f0d283bcab990181d2b2113bf1ae64a392cd28e4b023aa5bd76b1e5"; + version = "0.1.2.1"; + sha256 = "0a1a3756eb3e01ff82c14429331c172e19b54f01d1083a27fa493a6adb929456"; libraryHaskellDepends = [ aeson base boomerang lens safecopy web-routes web-routes-th ]; @@ -190459,6 +190960,7 @@ self: { homepage = "https://github.com/NICTA/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -193653,18 +194155,18 @@ self: { "wai-middleware-content-type" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring , clay, containers, exceptions, http-media, http-types, lucid - , mmorph, monad-control, monad-logger, mtl, resourcet, shakespeare - , text, transformers, transformers-base, wai, wai-transformers - , wai-util + , mmorph, monad-control, monad-logger, mtl, pandoc, resourcet + , shakespeare, text, transformers, transformers-base, wai + , wai-transformers, wai-util }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.0.3.2"; - sha256 = "68a7efb5a74898d2b579ea28a97c51bd2b021a9ab0629edad852d89a6d1878f1"; + version = "0.0.4"; + sha256 = "9c252bdd3e74043b36a3243d3223659db83a46cdd00e43bf1cae70ef67620623"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay containers exceptions http-media http-types lucid mmorph monad-control - monad-logger mtl resourcet shakespeare text transformers + monad-logger mtl pandoc resourcet shakespeare text transformers transformers-base wai wai-transformers wai-util ]; description = "Route to different middlewares based on the incoming Accept header"; @@ -194286,16 +194788,23 @@ self: { }) {}; "wai-session-postgresql" = callPackage - ({ mkDerivation, base, bytestring, cereal, postgresql-session - , postgresql-simple, time, transformers, wai-session + ({ mkDerivation, base, bytestring, cereal, data-default, entropy + , http-types, postgresql-session, postgresql-simple, text, time + , transformers, vault, wai, wai-session, warp }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.1.0.0"; - sha256 = "9597c3bf0ab5f03486bdc3e7908af49e78c99fed94620a1f5e91cccbd01767a2"; + version = "0.1.0.1"; + sha256 = "3a0651e2757d4a83d8dac6aebc61607b38207549dbdb2904ccbd0f410785bdfe"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring cereal postgresql-simple time transformers - wai-session + base bytestring cereal entropy postgresql-simple text time + transformers wai-session + ]; + executableHaskellDepends = [ + base bytestring data-default entropy http-types postgresql-simple + text vault wai wai-session warp ]; testHaskellDepends = [ base postgresql-session ]; jailbreak = true; @@ -194569,6 +195078,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-websockets_3_0_0_7" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , file-embed, http-types, network, text, transformers, wai + , wai-app-static, warp, websockets + }: + mkDerivation { + pname = "wai-websockets"; + version = "3.0.0.7"; + sha256 = "c4b6505833a09b1f2dda9da0f50f2825689dcb652909994b9217ea3ba92fc1da"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive http-types network + transformers wai websockets + ]; + executableHaskellDepends = [ + base blaze-builder bytestring case-insensitive file-embed + http-types network text transformers wai wai-app-static warp + websockets + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provide a bridge between WAI and the websockets package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wait-handle" = callPackage ({ mkDerivation, base }: mkDerivation { From 7a9bb6dee251596183b26b439b4d809a54d87a3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Nov 2015 11:57:29 +0100 Subject: [PATCH 149/157] Add LTS Haskell version 3.15. --- pkgs/top-level/haskell-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b3f050445a4..72386f12894 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -291,6 +291,9 @@ rec { lts-3_14 = packages.ghc7102.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.14.nix { }; }; + lts-3_15 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.15.nix { }; + }; }; } From 2b6f0d08c6a79d054e1b58d8fd37f23a56471627 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Nov 2015 11:59:13 +0100 Subject: [PATCH 150/157] haskell-gtk2hs-buildtools: build this package with alex 3.1.4 The latest version, alex 3.1.5, generates code that this package can't cope with. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index edafbe5eab6..c975e444d10 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -924,4 +924,7 @@ 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; }; + } From da54e29789ebcee896c6362c9b97abe640ea2adb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Nov 2015 16:48:38 +0100 Subject: [PATCH 151/157] haskell-morte: fix build by compiling with older version of alex --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c975e444d10..c5c592d940f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -927,4 +927,7 @@ self: super: { # 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; }; + } From 7ab53bc51a9f387014b513d6d69f00e9e1ee2d3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Nov 2015 17:05:37 +0100 Subject: [PATCH 152/157] haskell-language-c-quote: fix build by compiling with older version of alex --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c5c592d940f..a142722f4c8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -930,4 +930,7 @@ self: super: { # https://github.com/Gabriel439/Haskell-Morte-Library/issues/32 morte = super.morte.override { alex = self.alex_3_1_4; }; + # https://github.com/mainland/language-c-quote/issues/57 + language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; }; + } From e15a003ddde6f4bb0bedb1a00e61f3609f1ed479 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Nov 2015 11:15:14 +0100 Subject: [PATCH 153/157] haskell-alex: remove obsolete overrides: the test suite succeeds in version 3.1.5 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-nokinds.nix | 2 -- 3 files changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index f9f94c8f57d..35fd547d334 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -118,9 +118,6 @@ self: super: { # Version 1.19.5 fails its test suite. happy = dontCheck super.happy; - # Test suite fails in "/tokens_bytestring_unicode.g.bin". - alex = dontCheck super.alex; - # Upstream was notified about the over-specified constraint on 'base' # but refused to do anything about it because he "doesn't want to # support a moving target". Go figure. diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 55fd891ba2a..2f1d9b24580 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -55,8 +55,6 @@ self: super: { nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; - alex = dontCheck super.alex; - # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix index e62f21f135e..413984a7bd3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix @@ -44,8 +44,6 @@ self: super: { nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; - alex = dontCheck super.alex; - # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; From 8d937ac941d87686a5918b5f0b168295cfa2bb7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Nov 2015 15:01:57 +0100 Subject: [PATCH 154/157] configuration-hackage2nix.yaml: update list of broken builds --- .../configuration-hackage2nix.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9474ac2c8ac..7d80392944c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -250,6 +250,7 @@ dont-distribute-packages: api-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] apotiki: [ i686-linux, x86_64-linux, x86_64-darwin ] appc: [ i686-linux, x86_64-linux, x86_64-darwin ] + app-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] ApplePush: [ i686-linux, x86_64-linux, x86_64-darwin ] AppleScript: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -481,6 +482,7 @@ dont-distribute-packages: buffer-builder-aeson: [ i686-linux ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder: [ i686-linux ] + buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] buildwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -998,6 +1000,7 @@ dont-distribute-packages: easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ] ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] ed25519: [ i686-linux, x86_64-linux, x86_64-darwin ] edenmodules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1032,6 +1035,7 @@ dont-distribute-packages: emgm: [ i686-linux, x86_64-linux, x86_64-darwin ] Emping: [ i686-linux, x86_64-linux, x86_64-darwin ] Encode: [ i686-linux, x86_64-linux, x86_64-darwin ] + enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ] enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] enumfun: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumMap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1092,6 +1096,7 @@ dont-distribute-packages: FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] + family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] farmhash: [ x86_64-darwin ] fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-builder: [ x86_64-darwin ] @@ -1122,6 +1127,7 @@ dont-distribute-packages: file-location: [ x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] + file-modules: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1267,6 +1273,7 @@ dont-distribute-packages: geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geoip2: [ i686-linux ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] + geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] geom2d: [ i686-linux ] GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1595,6 +1602,7 @@ dont-distribute-packages: haskellscrabble: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-meta-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-token-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tyrant: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1605,8 +1613,10 @@ dont-distribute-packages: haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ] hask: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin-core: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin-node: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-script: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1829,6 +1839,7 @@ dont-distribute-packages: hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] hob: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] hofix-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] hog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1944,6 +1955,7 @@ dont-distribute-packages: HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-java: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2015,6 +2027,7 @@ dont-distribute-packages: hTensor: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] + html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] htoml: [ i686-linux, x86_64-linux, x86_64-darwin ] htsn-import: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-request-modifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2231,6 +2244,7 @@ dont-distribute-packages: keera-hails-reactive-polling: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactivevalues: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-wx: [ x86_64-darwin ] keera-hails-reactive-yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2336,6 +2350,7 @@ dont-distribute-packages: libcspm: [ i686-linux, x86_64-linux, x86_64-darwin ] libexpect: [ i686-linux, x86_64-linux, x86_64-darwin ] libGenI: [ i686-linux, x86_64-linux, x86_64-darwin ] + libgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] liblinear-enumerator: [ x86_64-darwin ] @@ -2506,6 +2521,7 @@ dont-distribute-packages: mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + meep: [ i686-linux, x86_64-linux, x86_64-darwin ] mega-sdist: [ i686-linux, x86_64-linux, x86_64-darwin ] melody: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3451,6 +3467,7 @@ dont-distribute-packages: stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-run-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] starrover2: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3528,6 +3545,7 @@ dont-distribute-packages: system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] system-time-monotonic: [ x86_64-darwin ] + tables: [ i686-linux, x86_64-linux, x86_64-darwin ] Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3599,6 +3617,7 @@ dont-distribute-packages: Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] tickle: [ i686-linux ] + tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-midi: [ x86_64-darwin ] @@ -3770,6 +3789,7 @@ dont-distribute-packages: vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + validation: [ i686-linux, x86_64-linux, x86_64-darwin ] vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] var: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] From 2cf7069b7da368326b51520536ac0f1020157f7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Nov 2015 15:40:58 +0100 Subject: [PATCH 155/157] fetchgit: call in-repository script with bash explicitly The script's shebang depends on /usr/bin/env, which we don't have in chroot environments. This patch remedies the fallout from ade9f7167dd1fec6, which fixed https://github.com/NixOS/nixpkgs/issues/11284. --- pkgs/build-support/fetchgit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 8ddb6a85d0c..c73ee193519 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -45,7 +45,7 @@ assert deepClone -> leaveDotGit; stdenv.mkDerivation { inherit name; builder = ./builder.sh; - fetcher = ./nix-prefetch-git; + fetcher = "${stdenv.shell} ${./nix-prefetch-git}"; buildInputs = [git]; outputHashAlgo = if sha256 == "" then "md5" else "sha256"; From af500630e86dd2c3c3c401978a808b35f32e0712 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 7 Sep 2015 22:38:57 +0200 Subject: [PATCH 156/157] wordpress: use the correct mysql pidDir --- nixos/modules/services/web-servers/apache-httpd/wordpress.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index 7a0314027a3..a28c8567f9f 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -248,7 +248,7 @@ in if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'." # Wait until MySQL is up - while [ ! -e /var/run/mysql/mysqld.pid ]; do + while [ ! -e ${serverInfo.fullConfig.services.mysql.pidDir}/mysqld.pid ]; do sleep 1 done ${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};' From ffc1762715d2419d7db953bf9c73d2f6f54d9d89 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Nov 2015 10:04:57 -0500 Subject: [PATCH 157/157] ats2: 0.1.12 -> 0.2.4 --- pkgs/development/compilers/ats2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 08cae4d3e42..280ed180344 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.12"; + version = "0.2.4"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1jiki88mzhki74xh5ffw3pali5zs74pa0nylcb8n4ypfvdpqvlhb"; + sha256 = "0dx3r2vxmarj3aqm0xlcmls1h08pll9y9k4820df41awyrwmfvcy"; }; buildInputs = [ gmp ];