From b0a51de6c10a7a1aba70c0a4aabe33a41bfb4c2c Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 17 Mar 2015 04:32:58 +0100 Subject: [PATCH 001/126] nixos/zfs: Keep zero-sized auto snapshots by default Otherwise, in certain cases, snapshots of infrequently-modified filesystems can be kept for a much longer time than the user would normally expect, and cause a large amount of extra disk space to be consumed. Also added flag to snapshot filesystems in parallel by default. I've also added a configuration option for zfs-auto-snapshot flags, so that the user can override them. For example, the user may want to append --utc to the list of default options, so that the snapshot names don't cause name conflicts or apparent time reversals due to daylight savings or timezone changes. --- nixos/modules/tasks/filesystems/zfs.nix | 34 ++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 1ac89c4c255..71054ff238e 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -12,6 +12,7 @@ let cfgSpl = config.boot.spl; cfgZfs = config.boot.zfs; cfgSnapshots = config.services.zfs.autoSnapshot; + cfgSnapFlags = cfgSnapshots.flags; inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems; @@ -137,6 +138,25 @@ in ''; }; + flags = mkOption { + default = "-k -p"; + example = "-k -p --utc"; + type = types.str; + description = '' + Flags to pass to the zfs-auto-snapshot command. + + Run zfs-auto-snapshot (without any arguments) to + see available flags. + + If it's not too inconvenient for snapshots to have timestamps in UTC, + it is suggested that you append --utc to the list + of default options (see example). + + Otherwise, snapshot names can cause name conflicts or apparent time + reversals due to daylight savings, timezone or other date/time changes. + ''; + }; + frequent = mkOption { default = 4; type = types.int; @@ -232,7 +252,9 @@ in environment.etc."zfs/zed.d".source = "${zfsUserPkg}/etc/zfs/zed.d/*"; system.fsPackages = [ zfsUserPkg ]; # XXX: needed? zfs doesn't have (need) a fsck - environment.systemPackages = [ zfsUserPkg ]; + environment.systemPackages = [ zfsUserPkg ] + ++ optional enableAutoSnapshots autosnapPkg; # so the user can run the command to see flags + services.udev.packages = [ zfsUserPkg ]; # to hook zvol naming, etc. systemd.packages = [ zfsUserPkg ]; @@ -289,7 +311,7 @@ in after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${zfsAutoSnap} frequent ${toString cfgSnapshots.frequent}"; + ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} frequent ${toString cfgSnapshots.frequent}"; }; restartIfChanged = false; startAt = "*:15,30,45"; @@ -300,7 +322,7 @@ in after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${zfsAutoSnap} hourly ${toString cfgSnapshots.hourly}"; + ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} hourly ${toString cfgSnapshots.hourly}"; }; restartIfChanged = false; startAt = "hourly"; @@ -311,7 +333,7 @@ in after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${zfsAutoSnap} daily ${toString cfgSnapshots.daily}"; + ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} daily ${toString cfgSnapshots.daily}"; }; restartIfChanged = false; startAt = "daily"; @@ -322,7 +344,7 @@ in after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${zfsAutoSnap} weekly ${toString cfgSnapshots.weekly}"; + ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} weekly ${toString cfgSnapshots.weekly}"; }; restartIfChanged = false; startAt = "weekly"; @@ -333,7 +355,7 @@ in after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${zfsAutoSnap} monthly ${toString cfgSnapshots.monthly}"; + ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} monthly ${toString cfgSnapshots.monthly}"; }; restartIfChanged = false; startAt = "monthly"; From 6197fdc02d20763e10beb73c0b6384c255f142b2 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 20 Mar 2015 03:49:25 +0100 Subject: [PATCH 002/126] nixos/zfs: Refactor auto-snapshots and make them persistent If you power off your machine frequently, you could miss the execution of some snapshots. This is more troublesome the more infrequently the snapshots are triggered. For example, monthly snapshots only execute at exactly midnight on the first day of the month. If you only have your machine powered on at that time with probability 50%, then half the snapshots won't be triggered. This means that if you wanted to keep 3 monthly snapshots, then instead of keeping 3 months' worth of snapshotted data as you expected, you would end up with snapshots spanning back 6 months. Adding the "Persistent = yes" option to auto-snapshot timer units makes a missed snapshot execute when booting up the machine. --- nixos/modules/tasks/filesystems/zfs.nix | 89 ++++++++++--------------- 1 file changed, 36 insertions(+), 53 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 71054ff238e..a4b01bc2fd1 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -46,6 +46,8 @@ let dataPools = unique (filter (pool: !(elem pool rootPools)) allPools); + snapshotNames = [ "frequent" "hourly" "daily" "weekly" "monthly" ]; + in { @@ -306,60 +308,41 @@ in }) (mkIf enableAutoSnapshots { - systemd.services."zfs-snapshot-frequent" = { - description = "ZFS auto-snapshotting every 15 mins"; - after = [ "zfs-import.target" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} frequent ${toString cfgSnapshots.frequent}"; - }; - restartIfChanged = false; - startAt = "*:15,30,45"; - }; + systemd.services = let + descr = name: if name == "frequent" then "15 mins" + else if name == "hourly" then "hour" + else if name == "daily" then "day" + else if name == "weekly" then "week" + else if name == "monthly" then "month" + else throw "unknown snapshot name"; + numSnapshots = name: builtins.getAttr name cfgSnapshots; + in builtins.listToAttrs (map (snapName: + { + name = "zfs-snapshot-${snapName}"; + value = { + description = "ZFS auto-snapshotting every ${descr snapName}"; + after = [ "zfs-import.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} ${snapName} ${toString (numSnapshots snapName)}"; + }; + restartIfChanged = false; + }; + }) snapshotNames); - systemd.services."zfs-snapshot-hourly" = { - description = "ZFS auto-snapshotting every hour"; - after = [ "zfs-import.target" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} hourly ${toString cfgSnapshots.hourly}"; - }; - restartIfChanged = false; - startAt = "hourly"; - }; - - systemd.services."zfs-snapshot-daily" = { - description = "ZFS auto-snapshotting every day"; - after = [ "zfs-import.target" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} daily ${toString cfgSnapshots.daily}"; - }; - restartIfChanged = false; - startAt = "daily"; - }; - - systemd.services."zfs-snapshot-weekly" = { - description = "ZFS auto-snapshotting every week"; - after = [ "zfs-import.target" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} weekly ${toString cfgSnapshots.weekly}"; - }; - restartIfChanged = false; - startAt = "weekly"; - }; - - systemd.services."zfs-snapshot-monthly" = { - description = "ZFS auto-snapshotting every month"; - after = [ "zfs-import.target" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${zfsAutoSnap} ${cfgSnapFlags} monthly ${toString cfgSnapshots.monthly}"; - }; - restartIfChanged = false; - startAt = "monthly"; - }; + systemd.timers = let + timer = name: if name == "frequent" then "*:15,30,45" else name; + in builtins.listToAttrs (map (snapName: + { + name = "zfs-snapshot-${snapName}"; + value = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = timer snapName; + Persistent = "yes"; + }; + }; + }) snapshotNames); }) ]; } From 0540a837893f1e32676fe2a9b093216b44f5dc24 Mon Sep 17 00:00:00 2001 From: Dave Laing Date: Fri, 13 May 2016 09:26:31 +1000 Subject: [PATCH 003/126] llvm-general: Adds Darwin compatibilty --- .../haskell-modules/configuration-common.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5f1335ca72f..ca96d057574 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -615,8 +615,20 @@ self: super: { # Uses OpenGL in testing caramia = dontCheck super.caramia; + llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: { + preConfigure = '' + sed -i llvm-general.cabal \ + -e 's,extra-libraries: stdc++,extra-libraries: c++,' + ''; + configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; + librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; + }); + # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 - llvm-general = super.llvm-general.override { llvm-config = pkgs.llvm_35; }; + llvm-general = + if pkgs.stdenv.isDarwin + then self.llvm-general-darwin + else super.llvm-general.override { llvm-config = pkgs.llvm_35; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; From 61ec8c1fe6edad1e99187b3f9ce74d14dc2078b7 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 7 Jun 2016 20:05:09 +0200 Subject: [PATCH 004/126] osm-gps-map: init at 1.1.0 --- .../libraries/osm-gps-map/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/osm-gps-map/default.nix diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix new file mode 100644 index 00000000000..7dc8b8c6112 --- /dev/null +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -0,0 +1,29 @@ +{ cairo, fetchzip, glib, gnome3, gobjectIntrospection, pkgconfig, stdenv }: + +stdenv.mkDerivation rec { + name = "osm-gps-map-${version}"; + version = "1.1.0"; + + src = fetchzip { + url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"; + sha256 = "0fal3mqcf3yypir4f7njz0dm5wr7lqwpimjx28wz9imh48cqx9n9"; + }; + + outputs = [ "dev" "out" "doc" ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + cairo glib gobjectIntrospection + ] ++ (with gnome3; [ + gnome_common gtk libsoup + ]); + + meta = with stdenv.lib; { + description = "Gtk+ widget for displaying OpenStreetMap tiles"; + homepage = https://nzjrs.github.io/osm-gps-map; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ hrdinka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec0e5547ce2..56c8138589e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8682,6 +8682,8 @@ in ortp = callPackage ../development/libraries/ortp { }; + osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; + p11_kit = callPackage ../development/libraries/p11-kit { }; paperkey = callPackage ../tools/security/paperkey { }; From dadd9a71507d1425c18c4209b7a8c09a5c34010c Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 7 Jun 2016 20:07:16 +0200 Subject: [PATCH 005/126] darktable: add map feature We lost darktables map (geo coordinates) feature in one of its pervious updates. This readds it. --- pkgs/applications/graphics/darktable/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 52a123a7fb9..609d88cea3a 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,7 +3,7 @@ , libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg , libpng, libpthreadstubs, librsvg, libtiff, libxcb -, openexr, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg +, openexr, osm-gps-map, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg , mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon , epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3 }: @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme + osm-gps-map ]; cmakeFlags = [ From 7298dd8cca8f575586fc7026b388f3928abeeb56 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 30 Jun 2016 10:12:24 +0100 Subject: [PATCH 006/126] ronn: init at 0.7.3 --- pkgs/development/tools/ronn/Gemfile | 3 +++ pkgs/development/tools/ronn/Gemfile.lock | 19 +++++++++++++ pkgs/development/tools/ronn/default.nix | 31 +++++++++++++++++++++ pkgs/development/tools/ronn/gemset.nix | 34 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 89 insertions(+) create mode 100644 pkgs/development/tools/ronn/Gemfile create mode 100644 pkgs/development/tools/ronn/Gemfile.lock create mode 100644 pkgs/development/tools/ronn/default.nix create mode 100644 pkgs/development/tools/ronn/gemset.nix diff --git a/pkgs/development/tools/ronn/Gemfile b/pkgs/development/tools/ronn/Gemfile new file mode 100644 index 00000000000..64f1df743ab --- /dev/null +++ b/pkgs/development/tools/ronn/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "ronn" diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock new file mode 100644 index 00000000000..c2b90f63494 --- /dev/null +++ b/pkgs/development/tools/ronn/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + hpricot (0.8.6) + mustache (1.0.3) + rdiscount (2.2.0.1) + ronn (0.7.3) + hpricot (>= 0.8.2) + mustache (>= 0.7.0) + rdiscount (>= 1.5.8) + +PLATFORMS + ruby + +DEPENDENCIES + ronn + +BUNDLED WITH + 1.11.2 diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix new file mode 100644 index 00000000000..7720c4f2bf2 --- /dev/null +++ b/pkgs/development/tools/ronn/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, bundlerEnv, makeWrapper, groff }: + +stdenv.mkDerivation rec { + name = "ronn-${version}"; + version = env.gems.ronn.version; + + env = bundlerEnv rec { + name = "ronn-gems"; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + + phases = ["installPhase"]; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/ronn $out/bin/ronn \ + --set PATH ${groff}/bin + ''; + + meta = with lib; { + description = "markdown-based tool for building manpages"; + homepage = https://rtomayko.github.io/ronn/; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + platforms = env.ruby.meta.platforms; + }; +} diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/development/tools/ronn/gemset.nix new file mode 100644 index 00000000000..ce804e1f9f5 --- /dev/null +++ b/pkgs/development/tools/ronn/gemset.nix @@ -0,0 +1,34 @@ +{ + hpricot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z"; + type = "gem"; + }; + version = "0.8.6"; + }; + mustache = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v4pdvgvs8gw0zbh5sy3l308amlsjg8sdfrkml0g0m0wwj4x7naf"; + type = "gem"; + }; + version = "1.0.3"; + }; + rdiscount = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; + type = "gem"; + }; + version = "2.2.0.1"; + }; + ronn = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2"; + type = "gem"; + }; + version = "0.7.3"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2cbe0fd03f..8bc98f1933b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9037,6 +9037,8 @@ in rote = callPackage ../development/libraries/rote { }; + ronn = callPackage ../development/tools/ronn { }; + rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; From 4932524080c8e187f698927b21cb667b814cf0cd Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 30 Jun 2016 11:12:20 +0100 Subject: [PATCH 007/126] zerotierone: build manpages --- pkgs/tools/networking/zerotierone/default.nix | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 29d131b509b..69529e8ba73 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute }: - -with stdenv.lib; +{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute, ronn }: stdenv.mkDerivation rec { version = "1.1.6"; @@ -13,28 +11,38 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace ./make-linux.mk \ - --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc"; + --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc"; substituteInPlace ./make-linux.mk \ - --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++"; + --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++"; substituteInPlace ./osdep/LinuxEthernetTap.cpp \ - --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' + --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' + + patchShebangs ./doc/build.sh + substituteInPlace ./doc/build.sh \ + --replace '/usr/bin/ronn' '${ronn}/bin/ronn' \ + --replace 'ronn -r' '${ronn}/bin/ronn -r' ''; - buildInputs = [ openssl lzo zlib gcc iproute ]; - - buildFlags = [ "one" ]; # TODO: Add support for building and installing manpages as well. + buildInputs = [ openssl lzo zlib gcc iproute ronn ]; installPhase = '' install -Dt "$out/bin/" zerotier-one ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool ln -s $out/bin/zerotier-one $out/bin/zerotier-cli + + mkdir -p $man/share/man/man8 + for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do + cat doc/$cmd | gzip -9 > $man/share/man/man8/$cmd.gz + done ''; - meta = { + outputs = [ "out" "man" ]; + + meta = with stdenv.lib; { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.sjmackenzie ]; - platforms = with stdenv.lib; platforms.allBut [ "i686-linux" ]; + license = licenses.gpl3; + maintainers = [ sjmackenzie ]; + platforms = platforms.allBut [ "i686-linux" ]; }; } From cbe5813e8433b76254f33a389f2bba6dd4b10253 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 30 Jun 2016 12:28:50 +0100 Subject: [PATCH 008/126] zerotierone: use compile from the stdenv --- pkgs/tools/networking/zerotierone/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 69529e8ba73..55be87f6a88 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute, ronn }: +{ stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { version = "1.1.6"; @@ -10,10 +10,6 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace ./make-linux.mk \ - --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc"; - substituteInPlace ./make-linux.mk \ - --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++"; substituteInPlace ./osdep/LinuxEthernetTap.cpp \ --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' @@ -23,7 +19,7 @@ stdenv.mkDerivation rec { --replace 'ronn -r' '${ronn}/bin/ronn -r' ''; - buildInputs = [ openssl lzo zlib gcc iproute ronn ]; + buildInputs = [ openssl lzo zlib iproute which ronn ]; installPhase = '' install -Dt "$out/bin/" zerotier-one From 83fd63995af5447a25ae79494b7ba29cd9ff0441 Mon Sep 17 00:00:00 2001 From: artuuge Date: Tue, 28 Jun 2016 08:41:24 +0200 Subject: [PATCH 009/126] cpp_ethereum: init at 1.2.9 jsoncpp: 1.6.5 -> 1.7.2 libjson_rpc_cpp: 0.2.1 -> 0.6.0 argtable: init at 3.0.1 libcpuid: init at 0.2.2 --- .../misc/webthree-umbrella/default.nix | 152 ++++++++++++++++++ .../libraries/jsoncpp/1.6.5/default.nix | 48 ++++++ .../development/libraries/jsoncpp/default.nix | 60 +++---- .../libjson-rpc-cpp/0.2.1/default.nix | 30 ++++ .../libraries/libjson-rpc-cpp/default.nix | 79 ++++++--- pkgs/tools/misc/argtable/default.nix | 41 +++++ pkgs/tools/misc/libcpuid/default.nix | 65 ++++++++ pkgs/top-level/all-packages.nix | 19 +++ 8 files changed, 437 insertions(+), 57 deletions(-) create mode 100644 pkgs/applications/misc/webthree-umbrella/default.nix create mode 100644 pkgs/development/libraries/jsoncpp/1.6.5/default.nix create mode 100644 pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix create mode 100644 pkgs/tools/misc/argtable/default.nix create mode 100644 pkgs/tools/misc/libcpuid/default.nix diff --git a/pkgs/applications/misc/webthree-umbrella/default.nix b/pkgs/applications/misc/webthree-umbrella/default.nix new file mode 100644 index 00000000000..bfdafc3ce39 --- /dev/null +++ b/pkgs/applications/misc/webthree-umbrella/default.nix @@ -0,0 +1,152 @@ +{ stdenv +, fetchgit +, cmake +, boost +, gmp +, jsoncpp +, leveldb +, cryptopp +, libcpuid +, miniupnpc +, libjson_rpc_cpp +, curl +, libmicrohttpd +, mesa + +, opencl-headers ? null + +, withAMD ? false +, amdappsdk ? null + +, withBeignet ? false +, beignet ? null + +, withCUDA ? false +, nvidia_x11 ? null + +, withGUI ? false +, qtwebengine ? null +, qtbase ? null +, qtdeclarative ? null + +, withProfiling ? false +, gperftools ? null + +, withEVMJIT ? false +, llvm ? null +, zlib ? null +, ncurses ? null + +, extraCmakeFlags ? [] +}: + +assert withAMD -> (amdappsdk != null); +assert withBeignet -> (beignet != null); +assert withCUDA -> (nvidia_x11 != null); +assert stdenv.lib.findSingle (x: x) true false [ withAMD withBeignet withCUDA ]; + +assert withGUI -> (qtwebengine != null) && (qtbase != null) && (qtdeclarative != null); +assert withProfiling -> (gperftools != null); +assert withEVMJIT -> (llvm != null) && (zlib != null) && (ncurses != null); + +let + withOpenCL = (stdenv.lib.any (x: x) [ withAMD withBeignet withCUDA ]); +in + +assert withOpenCL -> (opencl-headers != null); + +stdenv.mkDerivation rec { + name = "cpp-ethereum-${version}"; + version = "1.2.9"; + + src = fetchgit { + url = https://github.com/ethereum/webthree-umbrella.git; + rev = "850479b159a0bfa316fd261ab96b0a043acd766c"; + sha256 = "0k8w8gqzy71x77p0p85r38gfdnzrlzk2yvb3ablml9ppg4qb4ch5"; + }; + + patchPhase = stdenv.lib.optional withBeignet '' + sed -i -re 's#NAMES\ (OpenCL.*)#NAMES\ libcl.so\ \1#g' webthree-helpers/cmake/FindOpenCL.cmake + ''; + + cmakeFlags = with stdenv.lib; concatStringsSep " " (flatten [ + "-DCMAKE_BUILD_TYPE=Release" + "-DGUI=${toString withGUI}" + "-DETHASHCL=${toString withOpenCL}" + "-DPROFILING=${toString withProfiling}" + "-DEVMJIT=${toString withEVMJIT}" + (optional withOpenCL "-DCMAKE_INCLUDE_PATH=${opencl-headers}/include") + (optional withAMD "-DCMAKE_LIBRARY_PATH=${amdappsdk}/lib") + (optional withBeignet "-DCMAKE_LIBRARY_PATH=${beignet}/lib/beignet") + (optional withCUDA "-DCMAKE_LIBRARY_PATH=${nvidia_x11}/lib") + (optional withEVMJIT "-DCMAKE_PREFIX_PATH=${llvm}") + extraCmakeFlags + ]); + + configurePhase = '' + export BOOST_INCLUDEDIR=${boost}/include + export BOOST_LIBRARYDIR=${boost.out}/lib + + mkdir -p Build/Install + pushd Build + + cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install $cmakeFlags + ''; + + buildInputs = with stdenv.lib; [ + cmake + boost + gmp + jsoncpp + leveldb + cryptopp + libcpuid + miniupnpc + libjson_rpc_cpp + curl + libmicrohttpd + mesa + (optional withOpenCL opencl-headers) + (optional withAMD amdappsdk) + (optional withBeignet beignet) + (optional withCUDA nvidia_x11) + (optional withGUI [ + qtwebengine + qtbase + qtdeclarative + ]) + (optional withProfiling gperftools) + (optional withEVMJIT [ + llvm + zlib + ncurses + ]) + ]; + + runPath = with stdenv.lib; concatStringsSep ":" (flatten [ + (makeLibraryPath (flatten [ stdenv.cc.cc buildInputs ])) + (optional withBeignet "${beignet}/lib/beignet") + ]); + + installPhase = '' + make install + + mkdir -p $out + + for f in Install/lib/*.so* $(find Install/bin -executable -type f); do + patchelf --set-rpath $runPath:$out/lib $f + done + + cp -r Install/* $out + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + decription = "Umbrella project for the Ethereum C++ implementation"; + homepage = https://github.com/ethereum/webthree-umbrella.git; + license = licenses.gpl3; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix b/pkgs/development/libraries/jsoncpp/1.6.5/default.nix new file mode 100644 index 00000000000..53df8d6e7cf --- /dev/null +++ b/pkgs/development/libraries/jsoncpp/1.6.5/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, cmake, python }: + +stdenv.mkDerivation rec { + name = "jsoncpp-${version}"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "open-source-parsers"; + repo = "jsoncpp"; + rev = version; + sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0"; + }; + + /* During darwin bootstrap, we have a cp that doesn't understand the + * --reflink=auto flag, which is used in the default unpackPhase for dirs + */ + unpackPhase = '' + cp -a ${src} ${src.name} + chmod -R +w ${src.name} + export sourceRoot=${src.name} + ''; + + # Hack to be able to run the test, broken because we use + # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install + preBuild = '' + export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH" + ''; + + nativeBuildInputs = [ cmake python ]; + + CXXFLAGS = "-Wno-shift-negative-value"; + + cmakeFlags = [ + "-DJSONCPP_LIB_BUILD_SHARED=ON" + "-DJSONCPP_LIB_BUILD_STATIC=OFF" + "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" + ]; + + meta = { + inherit version; + homepage = https://github.com/open-source-parsers/jsoncpp; + description = "A simple API to manipulate JSON data in C++"; + maintainers = with stdenv.lib.maintainers; [ ttuegel page ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mit; + branch = "1.6"; + }; +} diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 53df8d6e7cf..5c4c4a693df 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,48 +1,34 @@ -{ stdenv, fetchFromGitHub, cmake, python }: - +{ stdenv +, fetchgit +, cmake +, python +}: stdenv.mkDerivation rec { name = "jsoncpp-${version}"; - version = "1.6.5"; + version = "1.7.2"; - src = fetchFromGitHub { - owner = "open-source-parsers"; - repo = "jsoncpp"; - rev = version; - sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0"; + src = fetchgit { + url = https://github.com/open-source-parsers/jsoncpp.git; + sha256 = "04w4cfmvyv52rpqhc370ln8rhlsrr515778bixhgafqbp3p4x34k"; + rev = "c8054483f82afc3b4db7efe4e5dc034721649ec8"; }; - /* During darwin bootstrap, we have a cp that doesn't understand the - * --reflink=auto flag, which is used in the default unpackPhase for dirs - */ - unpackPhase = '' - cp -a ${src} ${src.name} - chmod -R +w ${src.name} - export sourceRoot=${src.name} - ''; + configurePhase = '' + mkdir -p Build + pushd Build - # Hack to be able to run the test, broken because we use - # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preBuild = '' - export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH" - ''; + mkdir -p $out + cmake .. -DCMAKE_INSTALL_PREFIX=$out \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release + ''; - nativeBuildInputs = [ cmake python ]; + buildInputs = [ cmake python ]; - CXXFLAGS = "-Wno-shift-negative-value"; - - cmakeFlags = [ - "-DJSONCPP_LIB_BUILD_SHARED=ON" - "-DJSONCPP_LIB_BUILD_STATIC=OFF" - "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" - ]; - - meta = { - inherit version; + meta = with stdenv.lib; { homepage = https://github.com/open-source-parsers/jsoncpp; - description = "A simple API to manipulate JSON data in C++"; - maintainers = with stdenv.lib.maintainers; [ ttuegel page ]; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mit; - branch = "1.6"; + description = "A C++ library for interacting with JSON."; + license = licenses.mit; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix new file mode 100644 index 00000000000..5e0a8560110 --- /dev/null +++ b/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, cmake, curl }: + +let + basename = "libjson-rpc-cpp"; + version = "0.2.1"; +in + +stdenv.mkDerivation { + name = "${basename}-${version}"; + + src = fetchurl { + url = "https://github.com/cinemast/${basename}/archive/${version}.tar.gz"; + sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw"; + }; + + buildInputs = [ cmake curl ]; + + NIX_LDFLAGS = "-lpthread"; + enableParallelBuilding = true; + doCheck = true; + + checkPhase = "LD_LIBRARY_PATH=out/ ctest"; + + meta = { + description = "C++ framework for json-rpc (json remote procedure call)"; + homepage = https://github.com/cinemast/libjson-rpc-cpp; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 5e0a8560110..2cfede1eb6e 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,30 +1,69 @@ -{ stdenv, fetchurl, cmake, curl }: +{ stdenv +, fetchgit +, cmake +, jsoncpp +, argtable +, curl +, libmicrohttpd +, doxygen +, catch +}: +stdenv.mkDerivation rec { + name = "libjson-rpc-cpp-${version}"; + version = "0.6.0"; -let - basename = "libjson-rpc-cpp"; - version = "0.2.1"; -in - -stdenv.mkDerivation { - name = "${basename}-${version}"; - - src = fetchurl { - url = "https://github.com/cinemast/${basename}/archive/${version}.tar.gz"; - sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw"; + src = fetchgit { + url = https://github.com/cinemast/libjson-rpc-cpp.git; + sha256 = "00fxxisg89zgg1wq047n8r8ws48jx35x3s6bbym4kg7dkxv9vv9f"; + rev = "c6e3d7195060774bf95afc6df9c9588922076d3e"; }; - buildInputs = [ cmake curl ]; + patchPhase = '' + for f in cmake/FindArgtable.cmake \ + src/stubgenerator/stubgenerator.cpp \ + src/stubgenerator/stubgeneratorfactory.cpp + do + sed -i -re 's/argtable2/argtable3/g' $f + done - NIX_LDFLAGS = "-lpthread"; - enableParallelBuilding = true; - doCheck = true; + sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake + ''; - checkPhase = "LD_LIBRARY_PATH=out/ ctest"; + configurePhase = '' + mkdir -p Build/Install + pushd Build - meta = { + cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \ + -DCMAKE_BUILD_TYPE=Release + ''; + + installPhase = '' + mkdir -p $out + + function fixRunPath { + p=$(patchelf --print-rpath $1) + q="$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc jsoncpp argtable libmicrohttpd curl ]}:$out/lib" + patchelf --set-rpath $q $1 + } + + make install + + sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib/pkgconfig/*.pc + for f in Install/lib/*.so* $(find Install/bin -executable -type f); do + fixRunPath $f + done + + cp -r Install/* $out + ''; + + dontStrip = true; + + buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; + + meta = with stdenv.lib; { description = "C++ framework for json-rpc (json remote procedure call)"; homepage = https://github.com/cinemast/libjson-rpc-cpp; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix new file mode 100644 index 00000000000..76f42b1976a --- /dev/null +++ b/pkgs/tools/misc/argtable/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchgit +}: +stdenv.mkDerivation rec { + name = "argtable-${version}"; + version = "3.0.1"; + + src = fetchgit { + url = https://github.com/argtable/argtable3.git; + rev = "de93cfd85f755250285b337cba053a709a270721"; + sha256 = "0fbvk78s3dwryrzgafdra0lb8w7lb873c6xgldl94ps9828x85i3"; + }; + + buildPhase = '' + gcc -shared -o libargtable3.so -fPIC argtable3.c + + pushd tests + make + popd + ''; + + installPhase = '' + mkdir -p $out/include + cp argtable3.h $out/include + + mkdir -p $out/lib + cp libargtable3.so $out/lib + + mkdir -p $out/src + cp argtable3.c $out/src + cp -r examples $out/src + ln -s $out/include/argtable3.h $out/src/argtable3.h + ''; + + meta = with stdenv.lib; { + homepage = http://www.argtable.org/; + description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library"; + license = licenses.bsd3; + maintainers = with maintainers; [ artuuge ]; + }; +} diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix new file mode 100644 index 00000000000..8f258a38f7f --- /dev/null +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchgit +, libtool +, automake +, autoconf +, python +}: +stdenv.mkDerivation rec { + name = "libcpuid-${version}"; + version = "0.2.2"; + + src = fetchgit { + url = https://github.com/anrieff/libcpuid.git; + rev = "535ec64dd9d8df4c5a8d34b985280b58a5396fcf"; + sha256 = "1j9pg7fyvqhr859k5yh8ccl9jjx65c7rrsddji83qmqyg0vp1k1a"; + }; + + patchPhase = '' + libtoolize + autoreconf --install + ''; + + configurePhase = '' + mkdir -p Install + ./configure --prefix=$(pwd)/Install + substituteInPlace Makefile --replace "/usr/local" "$out" + ''; + + buildPhase = '' + make all + ''; + + postInstall = '' + pushd Install + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/ + popd + + function fixRunPath { + p0=$(patchelf --print-rpath $1) + p1=$(echo $p0 | sed -re 's#.*Install/lib:##g') + patchelf --set-rpath $p1 $1 + } + + fixRunPath Install/bin/cpuid_tool + + mkdir -p $out + sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc + + cp -r Install/* $out + cp -r tests $out + ''; + + buildInputs = [ + libtool + automake + autoconf + ]; + + meta = with stdenv.lib; { + homepage = http://libcpuid.sourceforge.net/; + description = "a small C library for x86 CPU detection and feature extraction"; + license = licenses.bsd3; + maintainers = with maintainers; [ artuuge ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7225a4e65e0..739a70938be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -412,6 +412,8 @@ in apitrace = qt55.callPackage ../applications/graphics/apitrace {}; + argtable = callPackage ../tools/misc/argtable {}; + argyllcms = callPackage ../tools/graphics/argyllcms {}; arp-scan = callPackage ../tools/misc/arp-scan { }; @@ -2156,6 +2158,8 @@ in less = callPackage ../tools/misc/less { }; + libcpuid = callPackage ../tools/misc/libcpuid { }; + lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { }; @@ -7550,6 +7554,8 @@ in jsoncpp = callPackage ../development/libraries/jsoncpp { }; + jsoncpp_1_6_5 = callPackage ../development/libraries/jsoncpp/1.6.5 { }; + jsonnet = callPackage ../development/compilers/jsonnet { }; libjson = callPackage ../development/libraries/libjson { }; @@ -8080,6 +8086,8 @@ in libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; + libjson_rpc_cpp_0_2_1 = callPackage ../development/libraries/libjson-rpc-cpp/0.2.1 { }; + libkate = callPackage ../development/libraries/libkate { }; libksba = callPackage ../development/libraries/libksba { }; @@ -12242,6 +12250,17 @@ in conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; conkeror = self.wrapFirefox conkeror-unwrapped { }; + cpp_ethereum = callPackage ../applications/misc/webthree-umbrella { + # withCUDA = true; + # inherit (linuxPackages) nvidia_x11; + + # withEVMJIT = true; + # inherit (pkgs.llvmPackages_38) llvm; + + # withGUI = true; + # inherit (pkgs.qt5) qtwebengine qtbase qtdeclarative; + }; + csdp = callPackage ../applications/science/math/csdp { liblapack = liblapackWithoutAtlas; }; From 5a8bf2c32bebd248e957a1822cfb60ca6c3e40ff Mon Sep 17 00:00:00 2001 From: artuuge Date: Sat, 2 Jul 2016 00:46:20 +0200 Subject: [PATCH 010/126] cpp_ethereum: use the ocl-icd package --- .../misc/webthree-umbrella/default.nix | 48 +++++-------------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 13 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/misc/webthree-umbrella/default.nix b/pkgs/applications/misc/webthree-umbrella/default.nix index bfdafc3ce39..3bf3142ad9c 100644 --- a/pkgs/applications/misc/webthree-umbrella/default.nix +++ b/pkgs/applications/misc/webthree-umbrella/default.nix @@ -13,16 +13,9 @@ , libmicrohttpd , mesa +, withOpenCL ? false , opencl-headers ? null - -, withAMD ? false -, amdappsdk ? null - -, withBeignet ? false -, beignet ? null - -, withCUDA ? false -, nvidia_x11 ? null +, ocl-icd ? null , withGUI ? false , qtwebengine ? null @@ -40,21 +33,11 @@ , extraCmakeFlags ? [] }: -assert withAMD -> (amdappsdk != null); -assert withBeignet -> (beignet != null); -assert withCUDA -> (nvidia_x11 != null); -assert stdenv.lib.findSingle (x: x) true false [ withAMD withBeignet withCUDA ]; - +assert withOpenCL -> (opencl-headers != null) && (ocl-icd != null); assert withGUI -> (qtwebengine != null) && (qtbase != null) && (qtdeclarative != null); assert withProfiling -> (gperftools != null); assert withEVMJIT -> (llvm != null) && (zlib != null) && (ncurses != null); -let - withOpenCL = (stdenv.lib.any (x: x) [ withAMD withBeignet withCUDA ]); -in - -assert withOpenCL -> (opencl-headers != null); - stdenv.mkDerivation rec { name = "cpp-ethereum-${version}"; version = "1.2.9"; @@ -65,20 +48,16 @@ stdenv.mkDerivation rec { sha256 = "0k8w8gqzy71x77p0p85r38gfdnzrlzk2yvb3ablml9ppg4qb4ch5"; }; - patchPhase = stdenv.lib.optional withBeignet '' - sed -i -re 's#NAMES\ (OpenCL.*)#NAMES\ libcl.so\ \1#g' webthree-helpers/cmake/FindOpenCL.cmake - ''; - cmakeFlags = with stdenv.lib; concatStringsSep " " (flatten [ "-DCMAKE_BUILD_TYPE=Release" "-DGUI=${toString withGUI}" "-DETHASHCL=${toString withOpenCL}" "-DPROFILING=${toString withProfiling}" "-DEVMJIT=${toString withEVMJIT}" - (optional withOpenCL "-DCMAKE_INCLUDE_PATH=${opencl-headers}/include") - (optional withAMD "-DCMAKE_LIBRARY_PATH=${amdappsdk}/lib") - (optional withBeignet "-DCMAKE_LIBRARY_PATH=${beignet}/lib/beignet") - (optional withCUDA "-DCMAKE_LIBRARY_PATH=${nvidia_x11}/lib") + (optional withOpenCL [ + "-DCMAKE_INCLUDE_PATH=${opencl-headers}/include" + "-DCMAKE_LIBRARY_PATH=${ocl-icd}/lib" + ]) (optional withEVMJIT "-DCMAKE_PREFIX_PATH=${llvm}") extraCmakeFlags ]); @@ -106,10 +85,10 @@ stdenv.mkDerivation rec { curl libmicrohttpd mesa - (optional withOpenCL opencl-headers) - (optional withAMD amdappsdk) - (optional withBeignet beignet) - (optional withCUDA nvidia_x11) + (optional withOpenCL [ + opencl-headers + ocl-icd + ]) (optional withGUI [ qtwebengine qtbase @@ -123,10 +102,7 @@ stdenv.mkDerivation rec { ]) ]; - runPath = with stdenv.lib; concatStringsSep ":" (flatten [ - (makeLibraryPath (flatten [ stdenv.cc.cc buildInputs ])) - (optional withBeignet "${beignet}/lib/beignet") - ]); + runPath = with stdenv.lib; (makeLibraryPath (flatten [ stdenv.cc.cc buildInputs ])); installPhase = '' make install diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 739a70938be..b6e2e7c89f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12251,8 +12251,7 @@ in conkeror = self.wrapFirefox conkeror-unwrapped { }; cpp_ethereum = callPackage ../applications/misc/webthree-umbrella { - # withCUDA = true; - # inherit (linuxPackages) nvidia_x11; + withOpenCL = true; # withEVMJIT = true; # inherit (pkgs.llvmPackages_38) llvm; From 956da24281b89dbd4a66efbdc3aaa39092a18b1d Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 5 Jul 2016 09:27:21 +0300 Subject: [PATCH 011/126] perlPackages.TextBibTeX: 0.71 -> 0.72 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0184e523773..062c8efe7fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12950,11 +12950,11 @@ let self = _self // overrides; _self = with self; { }; TextBibTeX = buildPerlModule rec { - name = "Text-BibTeX-0.71"; + name = "Text-BibTeX-0.72"; buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "1jwi4yc4l1sf9pyc6qifcm493lwf8iggdjli7f9a9aqin1swh36d"; + sha256 = "0vfnj9ygdjympc8hsf38nc4a1lq45qbq7v6z6mrnfgr3k198b6gw"; }; meta = { description = "Interface to read and parse BibTeX files"; From 6747bcf43ac3575ef537ec1850cb52585c4cbf20 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 29 Jun 2016 14:50:00 +0300 Subject: [PATCH 012/126] perlPackages.LinguaTranslit: init from 0.26 --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 062c8efe7fa..2cdb32d460b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7092,6 +7092,15 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + LinguaTranslit = buildPerlPackage rec { + name = "Lingua-Translit-0.26"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AL/ALINKE/${name}.tar.gz"; + sha256 = "2430b5c84927f15570533eb68c56958c580f16044fc413d48bf44f0460422598"; + }; + doCheck = false; + }; + LinuxDistribution = buildPerlPackage { name = "Linux-Distribution-0.23"; src = fetchurl { From 4aceac2b81ec11b5e7470b8f6bedd95d720b164b Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 29 Jun 2016 15:37:07 +0300 Subject: [PATCH 013/126] perlPackages.UnicodeNormalize: 1.19 -> 1.25 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2cdb32d460b..32ebebcfe8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13803,11 +13803,11 @@ let self = _self // overrides; _self = with self; { }; }; - UnicodeNormalize = buildPerlPackage { - name = "Unicode-Normalize-1.19"; + UnicodeNormalize = buildPerlPackage rec { + name = "Unicode-Normalize-1.25"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Normalize-1.19.tar.gz; - sha256 = "ab16467692cb78ced706fb7bee4145ac09d9f14d9eed92be4a305de3172ce6c4"; + url = "mirror://cpan/authors/id/K/KH/KHW/${name}.tar.gz"; + sha256 = "00b33a75d3b356ade2e09391ea2d32fac881671c18b1eb26b9ca31273d5b046c"; }; meta = { description = "Unicode Normalization Forms"; From a3e6044e9c1bae3877d8f4041e722a35efc40e6d Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 29 Jun 2016 14:44:51 +0300 Subject: [PATCH 014/126] biber: 2.4 -> 2.5 --- pkgs/tools/typesetting/biber/default.nix | 17 +++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index bdb33196db9..f068323e54a 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, buildPerlPackage, autovivification, BusinessISBN +{ stdenv, fetchFromGitHub, buildPerlPackage, autovivification, BusinessISBN , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder , FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils , ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor -, TextRoman, DataUniqid }: +, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize }: let - version = "2.4"; - pn = "biblatex-biber"; + version = "2.5"; in buildPerlPackage { name = "biber-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz"; - sha256 = "1gccbs5vzs3fca41d9dwl6nrdljnh29yls8xzfw04hd57yrfn5w4"; + src = fetchFromGitHub { + owner = "plk"; + repo = "biber"; + rev = "v${version}"; + sha256 = "1ldkszsr2n11nib4nvmpvsxmvp0qd9w3lxijyqlf01cfaryjdzgr"; }; buildInputs = [ @@ -23,7 +24,7 @@ buildPerlPackage { ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextRoman DataUniqid + ClassAccessor TextRoman DataUniqid LinguaTranslit UnicodeNormalize ]; preConfigure = "touch Makefile.PL"; buildPhase = "perl Build.PL --prefix=$out; ./Build build"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d606e24612..cc6a2dadda0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -921,7 +921,7 @@ in ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextRoman DataUniqid; + ClassAccessor TextRoman DataUniqid LinguaTranslit UnicodeNormalize; }; bibtextools = callPackage ../tools/typesetting/bibtex-tools { From 52d658df933c7cb6403829bc713ec6abf2fac937 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Wed, 13 Jul 2016 20:59:37 +1000 Subject: [PATCH 015/126] marp: init at 0.0.8 --- pkgs/applications/office/marp/default.nix | 32 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/office/marp/default.nix diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix new file mode 100644 index 00000000000..7c95bcafec5 --- /dev/null +++ b/pkgs/applications/office/marp/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, atomEnv, libXScrnSaver }: + +stdenv.mkDerivation rec { + name = "marp-${version}"; + version = "0.0.8"; + + src = fetchurl { + url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; + sha256 = "0d7vvz34ik2jafwl3qjkdsvcva25gyrgrfg1gz1nk8f5dkl1wjcf"; + }; + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/lib/marp $out/bin + cp -r ./* $out/lib/marp + ln -s $out/lib/marp/Marp $out/bin + ''; + + postFixup = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}:$out/lib/marp" \ + $out/bin/Marp + ''; + + meta = with stdenv.lib; { + description = "Markdown presentation writer, powered by Electron"; + homepage = https://yhatt.github.io/marp/; + license = licenses.mit; + maintainers = [ maintainers.puffnfresh ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b2c7013c7..eae5312d3bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13553,6 +13553,8 @@ in marathon = callPackage ../applications/networking/cluster/marathon { }; + marp = callPackage ../applications/office/marp { }; + matchbox = callPackage ../applications/window-managers/matchbox { }; MBdistortion = callPackage ../applications/audio/MBdistortion { }; From 36c906e7c0ca4f6672a0ad4aa9af04c858e913e7 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 15 Jul 2016 10:35:19 +0200 Subject: [PATCH 016/126] sysdig: 0.9.0 -> 0.10.0 --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 82e088b76c2..39ce6d588f8 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.9.0"; + version = "0.10.0"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "198x1zmlydvi4i1sfvs8xjh9z5pb47l6xs4phrnkwwak46rhka3j"; + sha256 = "0hs0r9z9j7padqdcj69bwx52iw6gvdl0w322qwivpv12j3prcpsj"; }; buildInputs = [ cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl From f4c34a834506f090e611bf3bb34c2494af5a407c Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Sat, 16 Jul 2016 20:51:15 +0100 Subject: [PATCH 017/126] tclx: init at 8.4.1 --- pkgs/development/libraries/tclx/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/tclx/default.nix diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix new file mode 100644 index 00000000000..1cb06377399 --- /dev/null +++ b/pkgs/development/libraries/tclx/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, tcl }: + +stdenv.mkDerivation rec { + name = "tclx-${version}.${patch}"; + version = "8.4"; + patch = "1"; + + src = fetchurl { + url = "mirror://sourceforge/tclx/tclx${version}.${patch}.tar.bz2"; + sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59"; + }; + + passthru = { + libPrefix = ""; # Using tclx${version} did not work + }; + + buildInputs = [ tcl ]; + + configureFlags = [ "--with-tcl=${tcl}/lib" "--exec-prefix=\${prefix}" ]; + + meta = { + homepage = http://tclx.sourceforge.net/; + description = "Tcl extensions"; + license = stdenv.lib.licenses.tcltk; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d606e24612..bcef3e9a726 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9227,6 +9227,8 @@ in tcltls = callPackage ../development/libraries/tcltls { }; + tclx = callPackage ../development/libraries/tclx { }; + ntdb = callPackage ../development/libraries/ntdb { python = python2; }; From 9a4d0d8e44214d7b0db1bd772efbb156e204ac92 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sun, 17 Jul 2016 17:28:06 +0530 Subject: [PATCH 018/126] alpine:configure: allow using passfile --- pkgs/applications/networking/mailreaders/alpine/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 8e5e8d5a0de..f2769946f70 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ssl-include-dir=${openssl.dev}/include/openssl" "--with-tcl-lib=${tcl.libPrefix}" + "--with-passfile=.pine-passfile" ]; preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" From 65881a7338c055b80cd4aa412a2a46d94a74c4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 17 Jul 2016 09:32:26 -0300 Subject: [PATCH 019/126] java-cup: 10k -> 11b-20160615 --- .../development/libraries/java/cup/builder.sh | 13 ------- .../libraries/java/cup/default.nix | 39 +++++++++++++++---- ...cup-0.11b_beta20160615-build-xml-git.patch | 38 ++++++++++++++++++ 3 files changed, 70 insertions(+), 20 deletions(-) delete mode 100755 pkgs/development/libraries/java/cup/builder.sh create mode 100644 pkgs/development/libraries/java/cup/javacup-0.11b_beta20160615-build-xml-git.patch diff --git a/pkgs/development/libraries/java/cup/builder.sh b/pkgs/development/libraries/java/cup/builder.sh deleted file mode 100755 index 3cd75dd396c..00000000000 --- a/pkgs/development/libraries/java/cup/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -set -e -source $stdenv/setup - -tar zxvf $src - -$jdk/bin/javac java_cup/*.java -$jdk/bin/javac java_cup/runtime/*.java - -mkdir -p $out/java_cup/runtime - -cp java_cup/*.class $out/java_cup -cp java_cup/runtime/*.class $out/java_cup/runtime/ - diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index 1181cef074e..de031a08fe8 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -1,13 +1,38 @@ -{stdenv, fetchurl, jdk} : +{ stdenv, fetchurl, jdk, ant } : -stdenv.mkDerivation { - name = "java-cup-10k"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "java-cup-${version}"; + version = "11b-20160615"; src = fetchurl { - url = http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz; - md5 = "8b11edfec13c590ea443d0f0ae0da479"; + url = "http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${version}.tar.gz"; + sha256 = "1ymz3plngxclh7x3xr31537rvvak7lwyd0qkmnl1mkj5drh77rz0"; }; - inherit jdk; + sourceRoot = "."; + + nativeBuildInputs = [ jdk ant ]; + + patches = [ ./javacup-0.11b_beta20160615-build-xml-git.patch ]; + + buildPhase = "ant"; + + installPhase = '' + mkdir -p $out/{bin,share/{java,java-cup}} + cp dist/java-cup-11b.jar $out/share/java-cup/ + cp dist/java-cup-11b-runtime.jar $out/share/java/ + cat > $out/bin/javacup < + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ${changed}${gitversion} + + + +@@ -79,7 +59,7 @@ + + ++ value='+ "v0.11b ${cupversion}"'> + + + From 7bed3d0cb38635cd34a6ac33f08b493184bf435c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 Jul 2016 23:27:45 +0300 Subject: [PATCH 020/126] nixos stage-1: move keymap handling to kbd module --- nixos/modules/system/boot/stage-1-init.sh | 4 ---- nixos/modules/system/boot/stage-1.nix | 11 +-------- nixos/modules/tasks/kbd.nix | 28 ++++++++++++----------- 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 7705dcb2d12..82995d5bab1 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -172,10 +172,6 @@ udevadm trigger --action=add udevadm settle -# Load boot-time keymap before any LVM/LUKS initialization -@extraUtils@/bin/busybox loadkmap < "@busyboxKeymap@" - - # XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered @preLVMCommands@ diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 4b1d3efb411..21a49d45789 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -185,15 +185,6 @@ let }; - # The binary keymap for busybox to load at boot. - busyboxKeymap = pkgs.runCommand "boottime-keymap" - { preferLocalBuild = true; } - '' - ${pkgs.kbd}/bin/loadkeys -qb "${config.i18n.consoleKeyMap}" > $out || - ${pkgs.kbd}/bin/loadkeys -qbu "${config.i18n.consoleKeyMap}" > $out - ''; - - # The init script of boot stage 1 (loading kernel modules for # mounting the root FS). bootStage1 = pkgs.substituteAll { @@ -203,7 +194,7 @@ let isExecutable = true; - inherit udevRules extraUtils modulesClosure busyboxKeymap; + inherit udevRules extraUtils modulesClosure; inherit (config.boot) resumeDevice devSize runSize; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 8cdd34ef174..e36aced1f82 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -61,7 +61,7 @@ in default = false; type = types.bool; description = '' - Enable setting font and keymap as early as possible (in initrd). + Enable setting font as early as possible (in initrd). ''; }; @@ -83,6 +83,20 @@ in environment.etc."vconsole.conf".source = vconsoleConf; # Provide kbd with additional packages. environment.etc."kbd".source = "${kbdEnv}/share"; + + boot.initrd.preLVMCommands = mkBefore '' + kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console + printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console + loadkmap < ${optimizedKeymap} + + ${optionalString config.boot.earlyVconsoleSetup '' + setfont -C /dev/console $extraUtils/share/consolefonts/font.psf + ''} + + ${concatImapStringsSep "\n" (n: color: '' + printf "${makeColorCS n color}" >> /dev/console + '') config.i18n.consoleColors} + ''; } (mkIf (!config.boot.earlyVconsoleSetup) { @@ -112,18 +126,6 @@ in cp -L $font $out/share/consolefonts/font.psf fi ''; - - boot.initrd.preLVMCommands = mkBefore '' - kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console - printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console - loadkmap < ${optimizedKeymap} - - setfont -C /dev/console $extraUtils/share/consolefonts/font.psf - - ${concatImapStringsSep "\n" (n: color: '' - printf "${makeColorCS n color}" >> /dev/console - '') config.i18n.consoleColors} - ''; }) ])) ]; From cf64a7ecc0f0feb654255a427e454a233773bbb9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 Jul 2016 23:46:38 +0300 Subject: [PATCH 021/126] kbd module: fix keymaps search for loadkeys --- nixos/modules/tasks/kbd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index e36aced1f82..789a04c7af8 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -14,8 +14,8 @@ let optimizedKeymap = pkgs.runCommand "keymap" { nativeBuildInputs = [ pkgs.kbd ]; + LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**"; } '' - cd ${kbdEnv}/share/keymaps loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out ''; From a7cb720bae8596fff6790ff99548443e1351dc33 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 18 Jul 2016 16:09:25 -0500 Subject: [PATCH 022/126] travis: remount for larger tmp dir --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 07e8006aa9a..3f2e3a47302 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ matrix: - os: linux sudo: required dist: trusty + before_script: + - sudo mount -o remount,exec,size=2G /run/user script: ./maintainers/scripts/travis-nox-review-pr.sh pr - os: osx osx_image: xcode7.3 From e18a91c47c7b27a17895fae29c1f9d914fa70813 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 18 Jul 2016 23:00:22 -0500 Subject: [PATCH 023/126] travis: just use "unstable" channel for nix-shell --- maintainers/scripts/travis-nox-review-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 386868301a2..5b25e4f37c1 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -55,7 +55,7 @@ while test -n "$1"; do token="--token $GITHUB_TOKEN" fi - nix-shell --packages nox git --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST" -I nixpkgs=$TRAVIS_BUILD_DIR + nix-shell --packages nox git --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST" fi ;; From dd72c722bf058b627456498f2c382196bcca3cce Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 18 Jul 2016 23:09:04 -0500 Subject: [PATCH 024/126] travis: mount /run/user as 755 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f2e3a47302..77881dbc492 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: sudo: required dist: trusty before_script: - - sudo mount -o remount,exec,size=2G /run/user + - sudo mount -o remount,exec,size=2G,mode=755 /run/user script: ./maintainers/scripts/travis-nox-review-pr.sh pr - os: osx osx_image: xcode7.3 From 24e9c0d7cc69a4194d47d3be50957d39ab2c9e6d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:45:30 +0200 Subject: [PATCH 025/126] gnome-photos: 3.20.1 -> 3.20.2 --- pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix index 48d0cc38519..c24de8525a8 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-photos-3.20.1"; + name = "gnome-photos-3.20.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.20/gnome-photos-3.20.1.tar.xz; - sha256 = "7639cc9367aa0f4bbf54aa46edaeedb91fcce85d387e8ffb669470710e247e5a"; + url = mirror://gnome/sources/gnome-photos/3.20/gnome-photos-3.20.2.tar.xz; + sha256 = "ec6b95ad1c4aeeb065a65d2d48335036c0750761c7f6762bafcf874791272b46"; }; } From ec8396e0e2fc0b6e899586d9a2de41c48ccedc8a Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:45:45 +0200 Subject: [PATCH 026/126] dconf-editor: 3.20.2 -> 3.20.3 --- pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix index 5980c0fc6af..ee04b9cd463 100644 --- a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "dconf-editor-3.20.2"; + name = "dconf-editor-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/dconf-editor/3.20/dconf-editor-3.20.2.tar.xz; - sha256 = "486dcb60001b934186f3c3591897d986459bf240f35641fbb59ee957c15af2be"; + url = mirror://gnome/sources/dconf-editor/3.20/dconf-editor-3.20.3.tar.xz; + sha256 = "a8721499a277550b28d8dd94dafbea6efeb95fa153020da10603d0d4d628c579"; }; } From e28f82f818a4173883b19668524a34ff310e9a1e Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:46:00 +0200 Subject: [PATCH 027/126] eog: 3.20.2 -> 3.20.3 --- pkgs/desktops/gnome-3/3.20/core/eog/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix index 90a4a8537fb..1aaf23319c4 100644 --- a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "eog-3.20.2"; + name = "eog-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/eog/3.20/eog-3.20.2.tar.xz; - sha256 = "d7d022af85ea0046e90b02fc94672757300bbbdb422eef2be2afc99fc2cd87e7"; + url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz; + sha256 = "16308c389deced3acb801dcc180c5e5e18b1db6ba5bd5835b5320cba9b0d2c26"; }; } From 050d534236f0957de4d2545dd5cf7178528df99a Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:46:10 +0200 Subject: [PATCH 028/126] epiphany: 3.20.2 -> 3.20.3 --- pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix index 1738b14e17b..457814913d6 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "epiphany-3.20.2"; + name = "epiphany-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/epiphany/3.20/epiphany-3.20.2.tar.xz; - sha256 = "d107ea1d621e91b1c5a7b51435fa81684d4cd4dd2c6fd71adf95e9a46fe6237a"; + url = mirror://gnome/sources/epiphany/3.20/epiphany-3.20.3.tar.xz; + sha256 = "4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2"; }; } From 09032af1cf39c33bdf2b25c268dddf609c9d2309 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:46:19 +0200 Subject: [PATCH 029/126] evince: 3.20.0 -> 3.20.1 --- pkgs/desktops/gnome-3/3.20/core/evince/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/evince/src.nix b/pkgs/desktops/gnome-3/3.20/core/evince/src.nix index 1f20db4a97e..6f924bbbc1b 100644 --- a/pkgs/desktops/gnome-3/3.20/core/evince/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/evince/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evince-3.20.0"; + name = "evince-3.20.1"; src = fetchurl { - url = mirror://gnome/sources/evince/3.20/evince-3.20.0.tar.xz; - sha256 = "cf8358a453686c2a7f85d245f83fe918c0ce02eb6532339f3e02e31249a5a280"; + url = mirror://gnome/sources/evince/3.20/evince-3.20.1.tar.xz; + sha256 = "fc7ac23036939c24f02e9fed6dd6e28a85b4b00b60fa4b591b86443251d20055"; }; } From 0a42105fc0d139aab5179866128033b4664d0185 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:46:34 +0200 Subject: [PATCH 030/126] gnome-bluetooth: 3.18.3 -> 3.20.0 --- .../desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix index 6da79276afc..474d4722b4a 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix @@ -1,12 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update -fetchurl: rec { - major = "3.18"; - minor = "3"; - name = "gnome-bluetooth-${major}.${minor}"; +fetchurl: { + name = "gnome-bluetooth-3.20.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${major}/${name}.tar.xz"; - sha256 = "1qwc9q7x22sc71zhqv4db78rqzxl6fqfw6d978ydqap54c2bg0g4"; + url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz; + sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53"; }; } From d46f684a446e8e16bd115545cff0bfa3244afff4 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:46:48 +0200 Subject: [PATCH 031/126] gnome-screenshot: 3.18.0 -> 3.20.1 --- pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix index af6007fa233..d6b0e28a0c2 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-screenshot-3.18.0"; + name = "gnome-screenshot-3.20.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-screenshot/3.18/gnome-screenshot-3.18.0.tar.xz; - sha256 = "eba64dbf4acf0ab8222fec549d0a4f2dd7dbd51c255e7978dedf1f5c06a98841"; + url = mirror://gnome/sources/gnome-screenshot/3.20/gnome-screenshot-3.20.1.tar.xz; + sha256 = "06a89b6887146cdbbeb64adf11bdae21acf22b0422337041c66eedb21ef7e143"; }; } From a0b973bd4e228120a561a61928e1b4820103d713 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:47:01 +0200 Subject: [PATCH 032/126] gnome-shell: 3.20.2 -> 3.20.3 --- pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix index 3033cdffa33..df4994cead0 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-shell-3.20.2"; + name = "gnome-shell-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.20/gnome-shell-3.20.2.tar.xz; - sha256 = "eaff6b177cc5bab16b252c45393a6c9305ad3837a288e738388c7b4d4bae13cd"; + url = mirror://gnome/sources/gnome-shell/3.20/gnome-shell-3.20.3.tar.xz; + sha256 = "b23fd558623bfdc726066be3f47bb5fb8ed9c0ad980a95d6afc6397b6d41171e"; }; } From 58d3e61b60fe1dbbe6e3384914363b4a13f81050 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:47:13 +0200 Subject: [PATCH 033/126] gtksourceview: 3.20.3 -> 3.20.4 --- pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix index 63de05e8820..4f80104cc3b 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gtksourceview-3.20.3"; + name = "gtksourceview-3.20.4"; src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.20/gtksourceview-3.20.3.tar.xz; - sha256 = "53069c6e2645716d5dc3dc875b2fe7aacbe70e6560f8dc01c66597231886a8df"; + url = mirror://gnome/sources/gtksourceview/3.20/gtksourceview-3.20.4.tar.xz; + sha256 = "7a0e6ac95ff3862bd8ef77a40e95a942939e73cb407f2eb67af600d7ce533d01"; }; } From 3376ab560d4fe367de2ef593d9bcd1017150955a Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:47:33 +0200 Subject: [PATCH 034/126] mutter: 3.20.2 -> 3.20.3 --- pkgs/desktops/gnome-3/3.20/core/mutter/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix index 47acaa6b58e..89f05f8ed1b 100644 --- a/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "mutter-3.20.2"; + name = "mutter-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/mutter/3.20/mutter-3.20.2.tar.xz; - sha256 = "1e8c46a81e21f382f56729282fcd0bb1c3a2067135f4b0f3651b307bf7a5b454"; + url = mirror://gnome/sources/mutter/3.20/mutter-3.20.3.tar.xz; + sha256 = "142c5271df4bde968c725ed09026173292c07b4dd7ba75f19c4b14fc363af916"; }; } From bb85d3fc0224edd4bc8fe11dd8f157db3aedc955 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:47:44 +0200 Subject: [PATCH 035/126] gnome-mines: 3.20.0 -> 3.20.1 --- pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix index 5dbae647661..9894d501122 100644 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix +++ b/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-mines-3.20.0"; + name = "gnome-mines-3.20.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-mines/3.20/gnome-mines-3.20.0.tar.xz; - sha256 = "7775c8d19cda9663a3e6b69d921c9de869278aeff93e249099af2d3c19b970a6"; + url = mirror://gnome/sources/gnome-mines/3.20/gnome-mines-3.20.1.tar.xz; + sha256 = "5815e886d92817d4127b9e94bf63cb91e2bf371029d18efdf9f195e2400e2b3b"; }; } From f7054319333ae5409ac7ee8162d9b20d7982d7e1 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 18 Jul 2016 08:47:58 +0200 Subject: [PATCH 036/126] gitg: 3.20.0 -> 3.20.1 --- pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix index ad05a219b25..805380c9d60 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gitg-3.20.0"; + name = "gitg-3.20.1"; src = fetchurl { - url = mirror://gnome/sources/gitg/3.20/gitg-3.20.0.tar.xz; - sha256 = "1f09f61208349d003f228e51dc9709bd3426960f5585c0e38197bd02b51f3346"; + url = mirror://gnome/sources/gitg/3.20/gitg-3.20.1.tar.xz; + sha256 = "104420bcdd765fa2196a7b146ba1e0fa82a5686ed5ba9af40e31e88e601aa585"; }; } From 537404c3b2c4db6c228696efe49f20a36c6c4dd6 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 19 Jul 2016 11:11:22 +0200 Subject: [PATCH 037/126] x42-plugins: 2015-07-02 -> 20160619 --- pkgs/applications/audio/x42-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 1090ee4a61e..f3a72050810 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "2015-07-02"; + version = "20160619"; name = "x42-plugins-${version}"; src = fetchurl { - url = "http://gareus.org/misc/x42-plugins/x42-plugins-20150702.tar.xz"; - sha256 = "1mq0grabzbl9xsd53v2qajhr8nngk0d4lx9n0n3nwy95y2gmy6sm"; + url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; + sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9"; }; buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; From 20bb5402dcc000c442a0d83b4f855fac05549c1e Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 19 Jul 2016 12:24:47 +0100 Subject: [PATCH 038/126] pythonPackages.pygit2: 0.23.1 -> 0.24.0 (#15986) --- 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 f8ca093b1bf..ef41756becc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17617,18 +17617,18 @@ in modules // { }; pygit2 = buildPythonPackage rec { - name = "pygit2-0.23.1"; + name = "pygit2-0.24.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pygit2/${name}.tar.gz"; - sha256 = "04201vcal7jq8lbpk9ylscrhjxdcf2aihiw25k4imjjqgfmvldf7"; + sha256 = "01c155ls0h5pvpdkrk8ld6fscshmz4fchcwxrg488dbij1zdjxms"; }; preConfigure = ( if stdenv.isDarwin then '' export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" '' else "" ); - propagatedBuildInputs = with self; [ pkgs.libgit2 ] ++ optionals (!isPyPy) [ cffi ]; + propagatedBuildInputs = with self; [ pkgs.libgit2 six ] ++ optionals (!isPyPy) [ cffi ]; preCheck = '' # disable tests that require networking From 4a1ffadcdbfc02b828e42c10bf2c43f75787bb31 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 19 Jul 2016 13:39:19 +0200 Subject: [PATCH 039/126] gtkspell3: 3.0.7 -> 3.0.8 --- pkgs/development/libraries/gtkspell/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index b9f2f3c77e5..1b28477f1e0 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkspell-${version}"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz"; - sha256 = "1hiwzajf18v9ik4nai3s7frps4ccn9s20nggad1c4k2mwb9ydwhk"; + sha256 = "1zrz5pz4ryvcssk898liynmy2wyxgj95ak7mp2jv7x62yzihq6h1"; }; buildInputs = [ aspell pkgconfig gtk3 enchant intltool ]; From 3b61bfe4cc86bebc0fbc3b578264788ca4cb208d Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 19 Jul 2016 13:39:57 +0200 Subject: [PATCH 040/126] gtkspellmm: 3.0.3 -> 3.0.4 --- pkgs/development/libraries/gtkspellmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index 44bb8051ea6..be2ae044022 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -4,7 +4,7 @@ }: let - version = "3.0.3"; + version = "3.0.4"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" + "${name}.tar.gz"; - sha256 = "f9dcc0991621c08e7a972f33487afd6b37491468f0b654f50c741a7e6d810624"; + sha256 = "0x6zx928dl62f0c0x6b2s32i06lvn18wx7crrgs1j9yjgkim4k4k"; }; propagatedBuildInputs = [ From 47b2d50f833723a675f2b04aa448b26b5e5e6ca0 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Tue, 19 Jul 2016 15:43:01 +0400 Subject: [PATCH 041/126] nodePackages.rollup: init at 0.31.2 (#16432) --- pkgs/top-level/node-packages-generated.nix | 39 ++++++++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 40 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 0ec4731a947..808a197ad3d 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -42094,6 +42094,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."rollup"."*" = + self.by-version."rollup"."0.31.2"; + by-version."rollup"."0.31.2" = self.buildNodePackage { + name = "rollup-0.31.2"; + version = "0.31.2"; + bin = true; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-0.31.2.tgz"; + name = "rollup-0.31.2.tgz"; + sha1 = "b479fe0a5faf7c310b8cc963da4dd0eb0a6174d0"; + }; + deps = { + "source-map-support-0.4.0" = self.by-version."source-map-support"."0.4.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "rollup" = self.by-version."rollup"."0.31.2"; by-spec."root"."^2.0.0" = self.by-version."root"."2.0.0"; by-version."root"."2.0.0" = self.buildNodePackage { @@ -45396,6 +45417,24 @@ os = [ ]; cpu = [ ]; }; + by-version."source-map-support"."0.4.0" = self.buildNodePackage { + name = "source-map-support-0.4.0"; + version = "0.4.0"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.0.tgz"; + name = "source-map-support-0.4.0.tgz"; + sha1 = "cb92292bc05455ce48691de545ac2690bb1cc976"; + }; + deps = { + "source-map-0.1.32" = self.by-version."source-map"."0.1.32"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."sparkles"."^1.0.0" = self.by-version."sparkles"."1.0.0"; by-version."sparkles"."1.0.0" = self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 447fd30060b..a8bd2e05ec0 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -150,6 +150,7 @@ , "react-tools" , "redis" , "rethinkdb" +, "rollup" , "s3http" , "selenium-webdriver" , "semver" From 5ba8341ddcfc12130bdb2ac131e042d850b6b8cb Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 19 Jul 2016 13:52:46 +0200 Subject: [PATCH 042/126] sooperlooper: git version fixes build. (#17095) see: https://github.com/essej/sooperlooper/pull/6 --- .../audio/sooperlooper/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 372339474a5..a11f37a6d52 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl, liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx -,libsamplerate, rubberband, pkgconfig, ncurses +{ stdenv, fetchFromGitHub , liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx + ,libsamplerate, rubberband, pkgconfig, autoconf, automake, libtool, gettext, ncurses, which }: stdenv.mkDerivation rec { - name = "sooperlooper-${version}"; - version = "1.7.3"; - src = fetchurl { - url = "http://essej.net/sooperlooper/${name}.tar.gz"; - sha256 = "0n2gdxw1fx8nxxnpzf4sj0kp6k6zi1yq59cbz6qqzcnsnpnvszbs"; + name = "sooperlooper-git-${version}"; + version = "19-07-2016"; + + src = fetchFromGitHub { + owner = "essej"; + repo = "sooperlooper"; + rev = "3bdfe184cd59b51c757b8048536abc1146fb0de4"; + sha256 = "0qz25h4idv79m97ici2kzx72fwzks3lysyksk3p3rx72lsijhf3g"; }; buildInputs = [ - liblo libxml2 libjack2 libsndfile wxGTK libsigcxx - libsamplerate rubberband pkgconfig ncurses + liblo libxml2 libjack2 libsndfile wxGTK libsigcxx + libsamplerate rubberband pkgconfig autoconf automake libtool gettext ncurses which ]; meta = { From 802a700373ff2d933d65bd6a8546d14905dd912d Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 19 Jul 2016 06:55:44 -0500 Subject: [PATCH 043/126] virtualbox: fix virtualbox guest additions (#16964) --- nixos/modules/virtualisation/virtualbox-guest.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 59bac24a753..d253e9eab62 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -49,7 +49,7 @@ in serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; }; - services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ]; + services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" "modesetting" ]; services.xserver.config = '' From c20e20c060f27ab22efe0c6403906cbb3122b2b6 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 07:56:24 -0400 Subject: [PATCH 044/126] pythonPackages.jsonnet: init at same version as standalone --- pkgs/development/compilers/jsonnet/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index da91bd3a547..d31654cdf2d 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -5,7 +5,7 @@ let version = "0.8.7"; in stdenv.mkDerivation { name = "jsonnet-${version}"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef41756becc..d054cd2f4c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11804,6 +11804,10 @@ in modules // { }; }; + jsonnet = buildPythonPackage { + inherit (pkgs.jsonnet) name src; + }; + jupyter_client = buildPythonPackage rec { version = "4.2.2"; name = "jupyter_client-${version}"; From b1bab4c93fb66a91a40f95a1f8dd5e08b349c348 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 07:57:15 -0400 Subject: [PATCH 045/126] pythonPackages.httpretty: update to 0.8.10 It's not the newest version, but it's newer and the patch still applied so I left it alone. --- 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 d054cd2f4c7..fa7d649ed3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11211,12 +11211,12 @@ in modules // { httpretty = buildPythonPackage rec { name = "httpretty-${version}"; - version = "0.8.6"; + version = "0.8.10"; doCheck = false; src = pkgs.fetchurl { url = "mirror://pypi/h/httpretty/${name}.tar.gz"; - sha256 = "0f295zj272plr9lhf80kgz19dxkargwv3ar83rwavrcy516mgg9n"; + sha256 = "1nmdk6d89z14x3wg4yxywlxjdip16zc8bqnfb471z1365mr74jj7"; }; buildInputs = with self; [ tornado requests2 httplib2 sure nose coverage certifi ]; From bb1e00dcb57cdc0e6fc7100f57acc38539bb0ed9 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 07:57:42 -0400 Subject: [PATCH 046/126] pythonPackages.cffi: remove unnecessary compiler flag I thought this was necessary but it doesn't appear to be after all --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa7d649ed3f..0887cf084c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4379,8 +4379,6 @@ in modules // { substituteInPlace testing/cffi0/test_ownlib.py --replace "gcc" "cc" ''; - NIX_CFLAGS_COMPILE="-Wno-shift-negative-value"; - checkPhase = '' py.test ''; From 46378eb128b3e64152a75bdb36eef8399e87558d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Jul 2016 12:07:23 +0200 Subject: [PATCH 047/126] hdf5: propagate optional zlib dependency --- pkgs/tools/misc/hdf5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 84945d27dd1..11e1609ff0e 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { buildInputs = [] ++ optional (gfortran != null) gfortran - ++ optional (zlib != null) zlib ++ optional (szip != null) szip; propagatedBuildInputs = [] + ++ optional (zlib != null) zlib ++ optional (mpi != null) mpi; configureFlags = [] From 47e66f08e12aba48a7bc1e76fd9010bde0371e9e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Jul 2016 12:07:47 +0200 Subject: [PATCH 048/126] netcdf: remove zlib since its propagated now by hdf5 --- pkgs/development/libraries/netcdf/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index a65b41c0261..70426c00237 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, zlib , hdf5 , m4 , curl # for DAP @@ -16,7 +15,7 @@ in stdenv.mkDerivation rec { sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx"; }; - buildInputs = [ hdf5 zlib m4 curl mpi]; + buildInputs = [ hdf5 m4 curl mpi]; passthru = { mpiSupport = mpiSupport; From c51b8dc2249974177d50d7b2662615f78abc4929 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Jul 2016 12:30:31 +0200 Subject: [PATCH 049/126] pythonPackages.{h5py, h5py-mpi}: simplify expression/assertions --- pkgs/development/python-modules/h5py/default.nix | 15 +++++++-------- pkgs/top-level/python-packages.nix | 6 ++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 5b1ca192790..37265a88e2c 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,17 +1,16 @@ { stdenv, fetchurl, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig -, mpiSupport ? false, mpi4py ? null, mpi ? null }: +, mpi4py ? null }: -assert mpiSupport == hdf5.mpiSupport; -assert mpiSupport -> mpi != null - && mpi4py != null - && mpi == mpi4py.mpi - && mpi == hdf5.mpi - ; +assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; with stdenv.lib; -buildPythonPackage rec { +let + mpi = hdf5.mpi; + mpiSupport = hdf5.mpiSupport; + +in buildPythonPackage rec { name = "h5py-${version}"; version = "2.5.0"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0887cf084c7..783578b1f1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -227,13 +227,11 @@ in modules // { }; h5py = callPackage ../development/python-modules/h5py { - hdf5 = pkgs.hdf5.override { mpi = null; }; + hdf5 = pkgs.hdf5; }; h5py-mpi = self.h5py.override { - mpiSupport = true; - mpi = pkgs.openmpi; - hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; }; + hdf5 = pkgs.hdf5-mpi; }; mpi4py = callPackage ../development/python-modules/mpi4py { From 6e3137adca79e0ebf200aec7417fdf8a4836a97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 19 Jul 2016 14:01:59 +0200 Subject: [PATCH 050/126] gnuk: use gcc-arm-embedded 4.9 The default gcc-arm-embedded version will soon be 5.x, and that breaks gnuk. --- pkgs/top-level/all-packages.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc1d3d862be..fe10a829d96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16924,9 +16924,15 @@ in gnome-breeze = callPackage ../misc/themes/gnome-breeze { }; - gnuk = callPackage ../misc/gnuk { }; - gnuk-unstable = lowPrio (callPackage ../misc/gnuk/unstable.nix { }); - gnuk-git = lowPrio (callPackage ../misc/gnuk/git.nix { }); + gnuk = callPackage ../misc/gnuk { + gcc-arm-embedded = gcc-arm-embedded-4_9; + }; + gnuk-unstable = lowPrio (callPackage ../misc/gnuk/unstable.nix { + gcc-arm-embedded = gcc-arm-embedded-4_9; + }); + gnuk-git = lowPrio (callPackage ../misc/gnuk/git.nix { + gcc-arm-embedded = gcc-arm-embedded-4_9; + }); greybird = callPackage ../misc/themes/greybird { }; From d0de6344492e3f813c61d55b761af94d282f0d30 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Tue, 19 Jul 2016 12:58:41 +0300 Subject: [PATCH 051/126] gcc-arm-embedded: 5.2 -> 5.4 --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe10a829d96..f14b19418b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4632,12 +4632,12 @@ in releaseType = "update"; sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; }; - gcc-arm-embedded-5_2 = pkgs.callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-5 = pkgs.callPackage_i686 ../development/compilers/gcc-arm-embedded { dirName = "5.0"; - subdirName = "5-2015-q4-major"; - version = "5.2-2015q4-20151219"; - releaseType = "major"; - sha256 = "12mbwl9iwbw7h6gwwkvyvfmrsz7vgjz27jh2cz9z006ihzigi50y"; + subdirName = "5-2016-q2-update"; + version = "5.4-2016q2-20160622"; + releaseType = "update"; + sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; }; gcc-arm-embedded = self.gcc-arm-embedded-4_9; From 486445169fec17d74a622475b957d23b5123a111 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Tue, 19 Jul 2016 12:59:21 +0300 Subject: [PATCH 052/126] gcc-arm-embedded: change default 4.9 -> 5.4 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f14b19418b4..c723433bf51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4639,7 +4639,7 @@ in releaseType = "update"; sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; }; - gcc-arm-embedded = self.gcc-arm-embedded-4_9; + gcc-arm-embedded = self.gcc-arm-embedded-5; gforth = callPackage ../development/compilers/gforth {}; From 34b5d283cd2a8bbc05b798599120e53024865f08 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Tue, 19 Jul 2016 13:00:03 +0300 Subject: [PATCH 053/126] gcc-arm-embedded: update license According to https://launchpad.net/gcc-arm-embedded: > Licence: > Simplified BSD Licence, GNU GPL v2, GNU GPL v3, GNU LGPL v2.1, GNU > LGPL v3, MIT / X / Expat Licence --- .../compilers/gcc-arm-embedded/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 85d8d37b21c..65c0f2ea1c5 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation { }; buildInputs = [ bzip2 patchelf ]; - + dontPatchELF = true; - + phases = "unpackPhase patchPhase installPhase"; - + installPhase = '' mkdir -pv $out cp -r ./* $out @@ -42,8 +42,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)"; - homepage = "https://launchpad.net/gcc-arm-embedded"; - license = licenses.gpl3; + homepage = https://launchpad.net/gcc-arm-embedded; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = [ maintainers.rasendubi ]; platforms = platforms.linux; }; } From 450fa8d9a03c120500ca9c5cda3ccf7bda16fb67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Jul 2016 23:46:10 +0200 Subject: [PATCH 054/126] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v2.0-11-gcec8f95 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/19ec8f3a6d22036c2f0940213648fd16d5c444fa - LTS Haskell: https://github.com/fpco/lts-haskell/commit/a5a99cf17698741e56c8efdf50989692c2e363e0 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/bf146896f35132bf340fe59b27feb0f796c867b2 --- .../haskell-modules/configuration-lts-0.0.nix | 15 + .../haskell-modules/configuration-lts-0.1.nix | 15 + .../haskell-modules/configuration-lts-0.2.nix | 15 + .../haskell-modules/configuration-lts-0.3.nix | 15 + .../haskell-modules/configuration-lts-0.4.nix | 15 + .../haskell-modules/configuration-lts-0.5.nix | 15 + .../haskell-modules/configuration-lts-0.6.nix | 15 + .../haskell-modules/configuration-lts-0.7.nix | 15 + .../haskell-modules/configuration-lts-1.0.nix | 15 + .../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 | 16 + .../haskell-modules/configuration-lts-2.1.nix | 16 + .../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 | 17 + .../configuration-lts-2.17.nix | 17 + .../configuration-lts-2.18.nix | 17 + .../configuration-lts-2.19.nix | 17 + .../haskell-modules/configuration-lts-2.2.nix | 16 + .../configuration-lts-2.20.nix | 17 + .../configuration-lts-2.21.nix | 17 + .../configuration-lts-2.22.nix | 17 + .../haskell-modules/configuration-lts-2.3.nix | 16 + .../haskell-modules/configuration-lts-2.4.nix | 16 + .../haskell-modules/configuration-lts-2.5.nix | 16 + .../haskell-modules/configuration-lts-2.6.nix | 16 + .../haskell-modules/configuration-lts-2.7.nix | 16 + .../haskell-modules/configuration-lts-2.8.nix | 16 + .../haskell-modules/configuration-lts-2.9.nix | 17 + .../haskell-modules/configuration-lts-3.0.nix | 18 + .../haskell-modules/configuration-lts-3.1.nix | 18 + .../configuration-lts-3.10.nix | 20 + .../configuration-lts-3.11.nix | 20 + .../configuration-lts-3.12.nix | 21 + .../configuration-lts-3.13.nix | 21 + .../configuration-lts-3.14.nix | 21 + .../configuration-lts-3.15.nix | 21 + .../configuration-lts-3.16.nix | 21 + .../configuration-lts-3.17.nix | 21 + .../configuration-lts-3.18.nix | 21 + .../configuration-lts-3.19.nix | 21 + .../haskell-modules/configuration-lts-3.2.nix | 19 + .../configuration-lts-3.20.nix | 21 + .../configuration-lts-3.21.nix | 21 + .../configuration-lts-3.22.nix | 21 + .../haskell-modules/configuration-lts-3.3.nix | 19 + .../haskell-modules/configuration-lts-3.4.nix | 19 + .../haskell-modules/configuration-lts-3.5.nix | 20 + .../haskell-modules/configuration-lts-3.6.nix | 20 + .../haskell-modules/configuration-lts-3.7.nix | 20 + .../haskell-modules/configuration-lts-3.8.nix | 20 + .../haskell-modules/configuration-lts-3.9.nix | 20 + .../haskell-modules/configuration-lts-4.0.nix | 24 + .../haskell-modules/configuration-lts-4.1.nix | 24 + .../haskell-modules/configuration-lts-4.2.nix | 25 + .../haskell-modules/configuration-lts-5.0.nix | 25 + .../haskell-modules/configuration-lts-5.1.nix | 25 + .../configuration-lts-5.10.nix | 29 + .../configuration-lts-5.11.nix | 30 + .../configuration-lts-5.12.nix | 30 + .../configuration-lts-5.13.nix | 30 + .../configuration-lts-5.14.nix | 31 + .../configuration-lts-5.15.nix | 31 + .../configuration-lts-5.16.nix | 31 + .../configuration-lts-5.17.nix | 31 + .../configuration-lts-5.18.nix | 33 + .../haskell-modules/configuration-lts-5.2.nix | 26 + .../haskell-modules/configuration-lts-5.3.nix | 26 + .../haskell-modules/configuration-lts-5.4.nix | 26 + .../haskell-modules/configuration-lts-5.5.nix | 26 + .../haskell-modules/configuration-lts-5.6.nix | 27 + .../haskell-modules/configuration-lts-5.7.nix | 29 + .../haskell-modules/configuration-lts-5.8.nix | 29 + .../haskell-modules/configuration-lts-5.9.nix | 29 + .../haskell-modules/configuration-lts-6.0.nix | 39 + .../haskell-modules/configuration-lts-6.1.nix | 39 + .../haskell-modules/configuration-lts-6.2.nix | 40 + .../haskell-modules/configuration-lts-6.3.nix | 45 + .../haskell-modules/configuration-lts-6.4.nix | 46 + .../haskell-modules/configuration-lts-6.5.nix | 47 + .../haskell-modules/configuration-lts-6.6.nix | 51 + .../haskell-modules/configuration-lts-6.7.nix | 52 + .../haskell-modules/hackage-packages.nix | 1685 ++++++++++++++--- 99 files changed, 3591 insertions(+), 246 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index a4b6af3eb6b..fe80fc5aad3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -800,6 +800,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1830,6 +1831,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_4_0_2"; @@ -3123,6 +3125,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3610,6 +3613,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4527,6 +4531,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4913,6 +4918,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5231,6 +5237,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_2_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5469,6 +5476,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6126,6 +6134,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6372,6 +6381,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6837,6 +6847,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7294,6 +7305,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7801,6 +7813,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8056,6 +8069,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8488,6 +8502,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 04204e40226..c9b8a0406e9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -800,6 +800,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1830,6 +1831,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_4_0_2"; @@ -3123,6 +3125,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3610,6 +3613,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4527,6 +4531,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4913,6 +4918,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5231,6 +5237,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_2_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5469,6 +5476,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6126,6 +6134,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6372,6 +6381,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6837,6 +6847,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7294,6 +7305,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7801,6 +7813,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8056,6 +8069,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8488,6 +8502,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index eae18df92cd..0f2b41e0e52 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -800,6 +800,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1830,6 +1831,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_4_0_2"; @@ -3123,6 +3125,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3610,6 +3613,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4527,6 +4531,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4913,6 +4918,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5231,6 +5237,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_2_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5469,6 +5476,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6126,6 +6134,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6372,6 +6381,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6837,6 +6847,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7294,6 +7305,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7801,6 +7813,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8056,6 +8069,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8488,6 +8502,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 3ced309e08b..81a840f0c11 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -800,6 +800,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1830,6 +1831,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_4_0_2"; @@ -3123,6 +3125,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3610,6 +3613,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4527,6 +4531,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4913,6 +4918,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5231,6 +5237,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_2_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5469,6 +5476,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6126,6 +6134,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6372,6 +6381,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6837,6 +6847,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7294,6 +7305,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7801,6 +7813,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8056,6 +8069,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8488,6 +8502,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 48042705f5f..3c8e119baae 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -800,6 +800,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1830,6 +1831,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_4_0_2"; @@ -3123,6 +3125,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3610,6 +3613,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4525,6 +4529,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4911,6 +4916,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5229,6 +5235,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_2_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5467,6 +5474,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6124,6 +6132,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6370,6 +6379,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6835,6 +6845,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7292,6 +7303,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7798,6 +7810,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8053,6 +8066,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8485,6 +8499,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 5c246287aed..0654ab1a9b8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -800,6 +800,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1830,6 +1831,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_4_0_2"; @@ -3123,6 +3125,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3610,6 +3613,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4525,6 +4529,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4911,6 +4916,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5229,6 +5235,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_2_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5467,6 +5474,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6124,6 +6132,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6370,6 +6379,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6835,6 +6845,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7292,6 +7303,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7798,6 +7810,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8053,6 +8066,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8485,6 +8499,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 220a14bf4a1..a63516c5307 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -799,6 +799,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1829,6 +1830,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_4_0_2"; @@ -3122,6 +3124,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3609,6 +3612,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4523,6 +4527,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4909,6 +4914,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5227,6 +5233,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_2_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5465,6 +5472,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6122,6 +6130,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6368,6 +6377,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6833,6 +6843,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7290,6 +7301,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7795,6 +7807,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8050,6 +8063,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8482,6 +8496,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 7c3349d29e1..4e358f38324 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -799,6 +799,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1829,6 +1830,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_4_0_2"; @@ -3122,6 +3124,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3609,6 +3612,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4523,6 +4527,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4909,6 +4914,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5227,6 +5233,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_2_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5465,6 +5472,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6122,6 +6130,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6368,6 +6377,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6833,6 +6843,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7290,6 +7301,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7795,6 +7807,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8050,6 +8063,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8482,6 +8496,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index d56ee1e4932..6a2c203a850 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -796,6 +796,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1827,6 +1828,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3116,6 +3118,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3604,6 +3607,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4518,6 +4522,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4903,6 +4908,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5221,6 +5227,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_0"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5459,6 +5466,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6116,6 +6124,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6362,6 +6371,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6827,6 +6837,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7284,6 +7295,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7788,6 +7800,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8043,6 +8056,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8474,6 +8488,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index b576738f7a9..c3616d56856 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -796,6 +796,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1827,6 +1828,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3113,6 +3115,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3601,6 +3604,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4514,6 +4518,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4897,6 +4902,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5215,6 +5221,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_0"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5453,6 +5460,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6109,6 +6117,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6355,6 +6364,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6820,6 +6830,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7277,6 +7288,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7781,6 +7793,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8035,6 +8048,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8465,6 +8479,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 5902d3d2d0a..f1e1efe2b4a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3109,6 +3111,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3593,6 +3596,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4503,6 +4507,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4886,6 +4891,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5199,6 +5205,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5437,6 +5444,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6092,6 +6100,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6337,6 +6346,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6801,6 +6811,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7258,6 +7269,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7762,6 +7774,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8014,6 +8027,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8444,6 +8458,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index a488786d3ad..7290bbd9afe 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3109,6 +3111,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3592,6 +3595,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4502,6 +4506,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4885,6 +4890,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5197,6 +5203,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5434,6 +5441,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6089,6 +6097,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6334,6 +6343,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6798,6 +6808,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7255,6 +7266,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7759,6 +7771,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8011,6 +8024,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8441,6 +8455,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 3ae2f86b854..7ebad80925b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3109,6 +3111,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3592,6 +3595,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4502,6 +4506,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4885,6 +4890,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5197,6 +5203,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5434,6 +5441,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6089,6 +6097,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6334,6 +6343,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6798,6 +6808,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7255,6 +7266,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7759,6 +7771,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8011,6 +8024,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8441,6 +8455,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 6fdfa9b2af2..a24b8baa1af 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3109,6 +3111,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3592,6 +3595,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4501,6 +4505,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4884,6 +4889,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5196,6 +5202,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5433,6 +5440,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6088,6 +6096,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6333,6 +6342,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6797,6 +6807,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7254,6 +7265,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7758,6 +7770,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8010,6 +8023,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8440,6 +8454,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index fba79cca9bd..cbf9665b20d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -794,6 +794,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1824,6 +1825,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3106,6 +3108,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3589,6 +3592,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4498,6 +4502,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4881,6 +4886,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5193,6 +5199,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5430,6 +5437,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6085,6 +6093,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6330,6 +6339,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6794,6 +6804,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7250,6 +7261,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7754,6 +7766,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8006,6 +8019,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8436,6 +8450,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index df51f615b27..062eee5fcc4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -794,6 +794,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1823,6 +1824,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3103,6 +3105,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3586,6 +3589,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4495,6 +4499,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4878,6 +4883,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5190,6 +5196,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5427,6 +5434,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6082,6 +6090,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6325,6 +6334,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6789,6 +6799,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7244,6 +7255,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7748,6 +7760,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8000,6 +8013,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8429,6 +8443,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 17a5abbc529..49b84cd61e5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -796,6 +796,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1827,6 +1828,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3111,6 +3113,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3599,6 +3602,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4511,6 +4515,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4894,6 +4899,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5212,6 +5218,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_0"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5450,6 +5457,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6106,6 +6114,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6352,6 +6361,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6816,6 +6826,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7273,6 +7284,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7777,6 +7789,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8030,6 +8043,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8460,6 +8474,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 45e8cd33c16..2cbac473b07 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3110,6 +3112,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3597,6 +3600,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4508,6 +4512,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4891,6 +4896,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5209,6 +5215,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_0"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5447,6 +5454,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6103,6 +6111,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6348,6 +6357,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6812,6 +6822,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7269,6 +7280,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7773,6 +7785,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8026,6 +8039,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8456,6 +8470,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 2456073a420..f2c7261a578 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3109,6 +3111,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3596,6 +3599,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4507,6 +4511,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4890,6 +4895,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5208,6 +5214,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_0"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5446,6 +5453,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6102,6 +6110,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6347,6 +6356,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6811,6 +6821,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7268,6 +7279,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7772,6 +7784,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8025,6 +8038,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8455,6 +8469,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 75985a07aef..f61382ad830 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3109,6 +3111,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3596,6 +3599,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4507,6 +4511,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4890,6 +4895,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5203,6 +5209,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_0"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5441,6 +5448,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6097,6 +6105,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6342,6 +6351,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6806,6 +6816,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7263,6 +7274,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7767,6 +7779,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8020,6 +8033,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8450,6 +8464,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index a588ecaeff9..1b632c3715f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3109,6 +3111,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3594,6 +3597,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4504,6 +4508,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4887,6 +4892,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5200,6 +5206,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_0"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5438,6 +5445,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6093,6 +6101,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6338,6 +6347,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6802,6 +6812,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7259,6 +7270,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7763,6 +7775,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8016,6 +8029,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8446,6 +8460,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 7a8aa5bc545..01ad3efffae 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -795,6 +795,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1826,6 +1827,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3109,6 +3111,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3593,6 +3596,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4503,6 +4507,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4886,6 +4891,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5199,6 +5205,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5437,6 +5444,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6092,6 +6100,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6337,6 +6346,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6801,6 +6811,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7258,6 +7269,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7762,6 +7774,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_2"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -8015,6 +8028,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = dontDistribute super."smoothie"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8445,6 +8459,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index bbe9bb5c785..473962c25a9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -789,6 +789,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1815,6 +1816,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3094,6 +3096,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3576,6 +3579,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4482,6 +4486,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4863,6 +4868,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5171,6 +5177,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5406,6 +5413,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6055,6 +6063,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6107,6 +6116,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6293,6 +6303,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6754,6 +6765,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7209,6 +7221,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7713,6 +7726,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7963,6 +7977,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8387,6 +8402,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 9c133a7d90e..641f292420a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -789,6 +789,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1815,6 +1816,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3094,6 +3096,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3576,6 +3579,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4482,6 +4486,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4863,6 +4868,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5171,6 +5177,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5406,6 +5413,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6055,6 +6063,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6107,6 +6116,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6293,6 +6303,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6754,6 +6765,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7209,6 +7221,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7713,6 +7726,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7963,6 +7977,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8387,6 +8402,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 2bf1ca1242c..159f38dac4e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1809,6 +1810,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3084,6 +3086,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3563,6 +3566,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4468,6 +4472,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4849,6 +4854,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5155,6 +5161,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5388,6 +5395,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6036,6 +6044,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6088,6 +6097,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6275,6 +6285,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6734,6 +6745,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7188,6 +7200,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7690,6 +7703,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7940,6 +7954,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8137,6 +8152,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8356,6 +8372,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index dce16c62c95..69342cf7876 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1808,6 +1809,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3083,6 +3085,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3562,6 +3565,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4467,6 +4471,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4848,6 +4853,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5154,6 +5160,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5387,6 +5394,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6035,6 +6043,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6087,6 +6096,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6274,6 +6284,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6732,6 +6743,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7186,6 +7198,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7687,6 +7700,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7937,6 +7951,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8134,6 +8149,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8352,6 +8368,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 5d6a40dc3dd..150235f3022 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1808,6 +1809,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3083,6 +3085,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3562,6 +3565,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4467,6 +4471,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4848,6 +4853,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5154,6 +5160,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5387,6 +5394,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6035,6 +6043,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6087,6 +6096,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6274,6 +6284,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6732,6 +6743,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7186,6 +7198,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7686,6 +7699,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7936,6 +7950,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8133,6 +8148,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8351,6 +8367,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 68e7a0c544b..68ab563ffd3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1808,6 +1809,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3083,6 +3085,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3562,6 +3565,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4467,6 +4471,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4848,6 +4853,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5153,6 +5159,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5386,6 +5393,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6034,6 +6042,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6086,6 +6095,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6273,6 +6283,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6731,6 +6742,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7185,6 +7197,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7685,6 +7698,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7935,6 +7949,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8132,6 +8147,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8350,6 +8366,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index b9fb7d6f8a5..1e253e9cf1c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1808,6 +1809,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3083,6 +3085,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3561,6 +3564,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4466,6 +4470,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4847,6 +4852,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5151,6 +5157,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5384,6 +5391,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6032,6 +6040,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6084,6 +6093,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6271,6 +6281,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6729,6 +6740,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7183,6 +7195,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7683,6 +7696,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7933,6 +7947,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8130,6 +8145,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8348,6 +8364,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 18a31397b64..a95ec6caccf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1808,6 +1809,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3082,6 +3084,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3560,6 +3563,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4465,6 +4469,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4846,6 +4851,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5150,6 +5156,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5383,6 +5390,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6031,6 +6039,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6083,6 +6092,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6269,6 +6279,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6727,6 +6738,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7181,6 +7193,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7681,6 +7694,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7931,6 +7945,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8127,6 +8142,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8345,6 +8361,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index fb751d3e2f9..da9ce2a0bce 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1808,6 +1809,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3080,6 +3082,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3557,6 +3560,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4462,6 +4466,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4843,6 +4848,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5147,6 +5153,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5380,6 +5387,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6027,6 +6035,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6079,6 +6088,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6265,6 +6275,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6723,6 +6734,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7177,6 +7189,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7677,6 +7690,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7927,6 +7941,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8123,6 +8138,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8341,6 +8357,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 90ca70be0eb..184948230fc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1807,6 +1808,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3079,6 +3081,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3554,6 +3557,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4459,6 +4463,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4840,6 +4845,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5144,6 +5150,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5377,6 +5384,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6024,6 +6032,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6076,6 +6085,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6262,6 +6272,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6719,6 +6730,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7173,6 +7185,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7673,6 +7686,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7923,6 +7937,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8119,6 +8134,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8337,6 +8353,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 83cef991962..d22dac32860 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1807,6 +1808,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3077,6 +3079,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3552,6 +3555,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4457,6 +4461,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4838,6 +4843,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5142,6 +5148,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5375,6 +5382,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6022,6 +6030,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6074,6 +6083,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6260,6 +6270,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6716,6 +6727,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7170,6 +7182,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7670,6 +7683,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7920,6 +7934,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8116,6 +8131,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8334,6 +8350,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index f4452f3e69b..841b28f07f6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1807,6 +1808,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3077,6 +3079,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3551,6 +3554,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4456,6 +4460,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4837,6 +4842,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5141,6 +5147,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5374,6 +5381,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6021,6 +6029,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6073,6 +6082,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6259,6 +6269,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6715,6 +6726,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7169,6 +7181,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7669,6 +7682,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7919,6 +7933,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8115,6 +8130,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8333,6 +8349,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 18a5fc3ef85..576d5a9afe1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -789,6 +789,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1814,6 +1815,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3092,6 +3094,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3574,6 +3577,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4480,6 +4484,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4861,6 +4866,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5169,6 +5175,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5404,6 +5411,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6053,6 +6061,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6105,6 +6114,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6291,6 +6301,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6752,6 +6763,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7207,6 +7219,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7711,6 +7724,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7961,6 +7975,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8385,6 +8400,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 1d03c9d5b80..7e2b5906980 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1807,6 +1808,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3077,6 +3079,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3551,6 +3554,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4456,6 +4460,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4837,6 +4842,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5141,6 +5147,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5374,6 +5381,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6021,6 +6029,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6073,6 +6082,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6259,6 +6269,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6715,6 +6726,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7169,6 +7181,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7669,6 +7682,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7918,6 +7932,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8114,6 +8129,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8332,6 +8348,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index e5f16f9bbb2..28f96f44662 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1807,6 +1808,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3077,6 +3079,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3551,6 +3554,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4456,6 +4460,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4837,6 +4842,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5141,6 +5147,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5374,6 +5381,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6021,6 +6029,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6073,6 +6082,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6259,6 +6269,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6715,6 +6726,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7168,6 +7180,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7668,6 +7681,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7917,6 +7931,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8113,6 +8128,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8331,6 +8347,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 66c6adc3881..c2990d8b810 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1807,6 +1808,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3077,6 +3079,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3551,6 +3554,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4456,6 +4460,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4836,6 +4841,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5140,6 +5146,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5373,6 +5380,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6020,6 +6028,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6072,6 +6081,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6258,6 +6268,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6714,6 +6725,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7167,6 +7179,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7667,6 +7680,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7916,6 +7930,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8112,6 +8127,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8330,6 +8346,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index eb35a0931db..96a4ea2c990 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -789,6 +789,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1814,6 +1815,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3092,6 +3094,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3573,6 +3576,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4479,6 +4483,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4860,6 +4865,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5167,6 +5173,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5402,6 +5409,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6051,6 +6059,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6103,6 +6112,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6289,6 +6299,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6750,6 +6761,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7205,6 +7217,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7709,6 +7722,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7959,6 +7973,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8383,6 +8398,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 35bf5af61ff..172f6b5c2f9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -789,6 +789,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1814,6 +1815,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3092,6 +3094,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3573,6 +3576,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4479,6 +4483,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4860,6 +4865,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5167,6 +5173,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5402,6 +5409,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6051,6 +6059,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6103,6 +6112,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6289,6 +6299,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6749,6 +6760,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7204,6 +7216,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7707,6 +7720,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7957,6 +7971,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8381,6 +8396,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index c0754e8c86e..1203e9c1938 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -789,6 +789,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1814,6 +1815,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3091,6 +3093,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3572,6 +3575,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4478,6 +4482,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4859,6 +4864,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5166,6 +5172,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5401,6 +5408,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6050,6 +6058,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6102,6 +6111,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6288,6 +6298,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6748,6 +6759,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7203,6 +7215,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7706,6 +7719,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7956,6 +7970,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8380,6 +8395,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 5f6fb229a54..a6e59be4b6b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -789,6 +789,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1812,6 +1813,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3089,6 +3091,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3570,6 +3573,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4475,6 +4479,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4856,6 +4861,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5163,6 +5169,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5398,6 +5405,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6047,6 +6055,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6099,6 +6108,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6285,6 +6295,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6744,6 +6755,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7199,6 +7211,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7702,6 +7715,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7952,6 +7966,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8376,6 +8391,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 741603cc89d..4fe69666932 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -789,6 +789,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1812,6 +1813,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3089,6 +3091,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3570,6 +3573,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4475,6 +4479,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4856,6 +4861,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5163,6 +5169,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5398,6 +5405,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6047,6 +6055,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6099,6 +6108,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6286,6 +6296,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6745,6 +6756,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7200,6 +7212,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7703,6 +7716,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7953,6 +7967,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8377,6 +8392,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index aaf7d8ed806..dbe8f6baef2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1811,6 +1812,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3088,6 +3090,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3568,6 +3571,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4473,6 +4477,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4854,6 +4859,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5161,6 +5167,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5396,6 +5403,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6045,6 +6053,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6097,6 +6106,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6284,6 +6294,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6743,6 +6754,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7198,6 +7210,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7700,6 +7713,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7950,6 +7964,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8371,6 +8386,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index e894b57599c..54ccf254af5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -788,6 +788,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1809,6 +1810,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_5_0_1"; @@ -3085,6 +3087,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3564,6 +3567,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4469,6 +4473,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4850,6 +4855,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5156,6 +5162,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5391,6 +5398,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -6039,6 +6047,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "misfortune" = dontDistribute super."misfortune"; "missing-py2" = dontDistribute super."missing-py2"; @@ -6091,6 +6100,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_1"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops" = doDistribute super."monad-loops_0_4_2_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; @@ -6278,6 +6288,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6737,6 +6748,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -7192,6 +7204,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7694,6 +7707,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoid-extras" = doDistribute super."semigroupoid-extras_4_0"; "semigroupoids" = doDistribute super."semigroupoids_4_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; @@ -7944,6 +7958,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_1_3"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -8141,6 +8156,7 @@ self: super: { "stackage" = doDistribute super."stackage_0_7_2_0"; "stackage-cabal" = dontDistribute super."stackage-cabal"; "stackage-curator" = doDistribute super."stackage-curator_0_7_4"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-metadata" = dontDistribute super."stackage-metadata"; "stackage-sandbox" = dontDistribute super."stackage-sandbox"; "stackage-setup" = dontDistribute super."stackage-setup"; @@ -8361,6 +8377,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index c9f4481be8f..9395ee0ccf7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -777,6 +777,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1764,6 +1765,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3015,6 +3017,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3480,6 +3483,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4376,6 +4380,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4752,6 +4757,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5046,6 +5052,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5274,6 +5281,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5908,6 +5916,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5958,6 +5967,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6140,6 +6150,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6590,6 +6601,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6670,6 +6682,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -7035,6 +7048,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7538,6 +7552,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7780,6 +7795,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_0_2"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7973,6 +7989,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; @@ -8185,6 +8202,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 4ca49045ed8..8910bb011b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -777,6 +777,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1763,6 +1764,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3014,6 +3016,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3478,6 +3481,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4374,6 +4378,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4750,6 +4755,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5044,6 +5050,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5272,6 +5279,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5905,6 +5913,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5955,6 +5964,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6137,6 +6147,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6587,6 +6598,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6666,6 +6678,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -7031,6 +7044,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7533,6 +7547,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_3"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7775,6 +7790,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_0_2"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7968,6 +7984,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; @@ -8180,6 +8197,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 93738600458..3912438ff7a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1756,6 +1757,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3003,6 +3005,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3179,6 +3182,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3465,6 +3469,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4357,6 +4362,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4731,6 +4737,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5023,6 +5030,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5251,6 +5259,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5881,6 +5890,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5931,6 +5941,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_14"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6112,6 +6123,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6560,6 +6572,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6639,6 +6652,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6982,6 +6996,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7000,6 +7015,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7502,6 +7518,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7744,6 +7761,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7934,6 +7952,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8145,6 +8164,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 0f0c6837104..6e95124cc29 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1756,6 +1757,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3003,6 +3005,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3178,6 +3181,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3464,6 +3468,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4356,6 +4361,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4730,6 +4736,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5022,6 +5029,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5250,6 +5258,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5880,6 +5889,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5930,6 +5940,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_14"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6111,6 +6122,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6559,6 +6571,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6638,6 +6651,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6981,6 +6995,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6999,6 +7014,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7501,6 +7517,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7743,6 +7760,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7933,6 +7951,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8144,6 +8163,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 372de3cace5..8768024efef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1756,6 +1757,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2044,6 +2046,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -3002,6 +3005,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3177,6 +3181,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3463,6 +3468,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4354,6 +4360,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4728,6 +4735,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5020,6 +5028,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5248,6 +5257,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5878,6 +5888,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5928,6 +5939,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6109,6 +6121,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6556,6 +6569,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6635,6 +6649,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6978,6 +6993,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6996,6 +7012,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7498,6 +7515,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7740,6 +7758,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7930,6 +7949,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8141,6 +8161,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index bcd60522489..01594754b65 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1756,6 +1757,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2044,6 +2046,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -3002,6 +3005,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3177,6 +3181,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3463,6 +3468,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4353,6 +4359,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4727,6 +4734,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5019,6 +5027,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5247,6 +5256,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5876,6 +5886,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5926,6 +5937,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6107,6 +6119,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6553,6 +6566,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6632,6 +6646,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6975,6 +6990,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6993,6 +7009,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7495,6 +7512,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7737,6 +7755,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7927,6 +7946,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8138,6 +8158,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 56065ec833e..ebd6dfc7915 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1756,6 +1757,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2044,6 +2046,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -3002,6 +3005,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3177,6 +3181,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3463,6 +3468,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4353,6 +4359,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4727,6 +4734,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5018,6 +5026,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5246,6 +5255,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5875,6 +5885,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5925,6 +5936,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6106,6 +6118,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6552,6 +6565,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6631,6 +6645,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6974,6 +6989,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6992,6 +7008,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7494,6 +7511,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7736,6 +7754,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7926,6 +7945,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8137,6 +8157,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index eea9625cfc9..b0e0c50c75e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1756,6 +1757,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2044,6 +2046,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -3002,6 +3005,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3177,6 +3181,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3463,6 +3468,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4352,6 +4358,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4726,6 +4733,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5016,6 +5024,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5244,6 +5253,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5873,6 +5883,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5923,6 +5934,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6104,6 +6116,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6550,6 +6563,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6629,6 +6643,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6972,6 +6987,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6990,6 +7006,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7492,6 +7509,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7733,6 +7751,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7923,6 +7942,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8134,6 +8154,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 605d43e7462..274ab94ecc7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -775,6 +775,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1755,6 +1756,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2043,6 +2045,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -3001,6 +3004,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3176,6 +3180,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3462,6 +3467,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4351,6 +4357,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4725,6 +4732,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5015,6 +5023,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5243,6 +5252,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5870,6 +5880,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5920,6 +5931,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6101,6 +6113,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6547,6 +6560,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6626,6 +6640,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6968,6 +6983,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6986,6 +7002,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7487,6 +7504,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7728,6 +7746,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7918,6 +7937,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8129,6 +8149,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 0b9cef780e2..c498f6a3088 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -775,6 +775,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1754,6 +1755,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2042,6 +2044,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -3000,6 +3003,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3175,6 +3179,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3461,6 +3466,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4349,6 +4355,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4723,6 +4730,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5012,6 +5020,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5240,6 +5249,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5866,6 +5876,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5916,6 +5927,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6096,6 +6108,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6542,6 +6555,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6621,6 +6635,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6963,6 +6978,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6981,6 +6997,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7482,6 +7499,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7723,6 +7741,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7913,6 +7932,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8124,6 +8144,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index 650c43f15e0..9378bc79c4b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -775,6 +775,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1754,6 +1755,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2042,6 +2044,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -3000,6 +3003,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3175,6 +3179,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3461,6 +3466,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4349,6 +4355,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4723,6 +4730,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5012,6 +5020,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5240,6 +5249,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5866,6 +5876,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5916,6 +5927,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6096,6 +6108,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6542,6 +6555,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6621,6 +6635,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6963,6 +6978,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6981,6 +6997,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7482,6 +7499,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7723,6 +7741,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7913,6 +7932,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8124,6 +8144,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 1b8fb592432..bfc339ca798 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -775,6 +775,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1753,6 +1754,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2040,6 +2042,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2997,6 +3000,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3172,6 +3176,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3458,6 +3463,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4346,6 +4352,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4718,6 +4725,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5007,6 +5015,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5234,6 +5243,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5860,6 +5870,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5910,6 +5921,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6090,6 +6102,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6535,6 +6548,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6614,6 +6628,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6956,6 +6971,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6974,6 +6990,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7475,6 +7492,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7716,6 +7734,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7905,6 +7924,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8116,6 +8136,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index ed852ba2eec..5c6270f1104 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1761,6 +1762,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3011,6 +3013,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3475,6 +3478,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4370,6 +4374,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4746,6 +4751,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5040,6 +5046,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5268,6 +5275,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5901,6 +5909,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5951,6 +5960,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6133,6 +6143,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6583,6 +6594,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6662,6 +6674,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -7008,6 +7021,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7026,6 +7040,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7528,6 +7543,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7770,6 +7786,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_0_2"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7962,6 +7979,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; @@ -8174,6 +8192,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index c75fbd244f6..b47d0d66dc6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -774,6 +774,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1752,6 +1753,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2039,6 +2041,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2996,6 +2999,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3171,6 +3175,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3457,6 +3462,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4345,6 +4351,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4717,6 +4724,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5006,6 +5014,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5233,6 +5242,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5859,6 +5869,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5909,6 +5920,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6089,6 +6101,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6534,6 +6547,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6613,6 +6627,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6955,6 +6970,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6973,6 +6989,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7473,6 +7490,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7714,6 +7732,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7903,6 +7922,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8113,6 +8133,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index a3a576bffbd..5af9af67434 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -774,6 +774,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1752,6 +1753,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2039,6 +2041,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2995,6 +2998,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3168,6 +3172,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3454,6 +3459,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4342,6 +4348,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4714,6 +4721,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5001,6 +5009,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_3"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5228,6 +5237,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5854,6 +5864,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5904,6 +5915,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6084,6 +6096,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6528,6 +6541,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6607,6 +6621,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6949,6 +6964,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6967,6 +6983,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7467,6 +7484,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7704,6 +7722,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7893,6 +7912,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8103,6 +8123,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index 08ab10f165e..a8d27c54dc9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -774,6 +774,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1752,6 +1753,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -2039,6 +2041,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2995,6 +2998,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3167,6 +3171,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3453,6 +3458,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4341,6 +4347,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4713,6 +4720,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4999,6 +5007,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5225,6 +5234,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5851,6 +5861,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5901,6 +5912,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6081,6 +6093,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6525,6 +6538,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6604,6 +6618,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6946,6 +6961,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6964,6 +6980,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7464,6 +7481,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7701,6 +7719,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7890,6 +7909,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8100,6 +8120,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 9dd0cca2fa1..d469a1e0fbd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1761,6 +1762,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3011,6 +3013,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3474,6 +3477,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4369,6 +4373,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4744,6 +4749,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5038,6 +5044,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5266,6 +5273,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5899,6 +5907,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5949,6 +5958,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6131,6 +6141,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6581,6 +6592,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6660,6 +6672,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -7006,6 +7019,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7024,6 +7038,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7526,6 +7541,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7768,6 +7784,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_0_2"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7959,6 +7976,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; @@ -8171,6 +8189,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index ab34692cdfd..01ab4070a2d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1761,6 +1762,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3011,6 +3013,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3474,6 +3477,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4369,6 +4373,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4744,6 +4749,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5038,6 +5044,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_1"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5266,6 +5273,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5899,6 +5907,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5949,6 +5958,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6131,6 +6141,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6581,6 +6592,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6660,6 +6672,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -7006,6 +7019,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7024,6 +7038,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7526,6 +7541,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7768,6 +7784,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_0_2"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7959,6 +7976,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8170,6 +8188,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index e0bba2b3882..4fba7c89800 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1760,6 +1761,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3010,6 +3012,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3186,6 +3189,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3472,6 +3476,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4367,6 +4372,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4741,6 +4747,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5033,6 +5040,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5261,6 +5269,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5894,6 +5903,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5944,6 +5954,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6125,6 +6136,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6575,6 +6587,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6654,6 +6667,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6999,6 +7013,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7017,6 +7032,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7519,6 +7535,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7761,6 +7778,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_0_2"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7952,6 +7970,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8163,6 +8182,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 088599b21f5..e326847e919 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1760,6 +1761,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3010,6 +3012,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3186,6 +3189,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3472,6 +3476,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4365,6 +4370,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4739,6 +4745,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5031,6 +5038,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5259,6 +5267,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5890,6 +5899,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5940,6 +5950,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6121,6 +6132,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6571,6 +6583,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6650,6 +6663,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6995,6 +7009,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7013,6 +7028,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7515,6 +7531,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7757,6 +7774,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7948,6 +7966,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8159,6 +8178,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 089f82f285e..258114215a2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1759,6 +1760,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3008,6 +3010,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3184,6 +3187,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3470,6 +3474,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4362,6 +4367,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4736,6 +4742,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5028,6 +5035,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5256,6 +5264,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5887,6 +5896,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5937,6 +5947,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_13_2"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6118,6 +6129,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6568,6 +6580,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6647,6 +6660,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6990,6 +7004,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7008,6 +7023,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7510,6 +7526,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7752,6 +7769,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7942,6 +7960,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8153,6 +8172,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index d2c60d1621f..4e58939c62a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1757,6 +1758,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3005,6 +3007,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3181,6 +3184,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3467,6 +3471,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4359,6 +4364,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4733,6 +4739,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5025,6 +5032,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5253,6 +5261,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5883,6 +5892,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5933,6 +5943,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_14"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6114,6 +6125,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6564,6 +6576,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6643,6 +6656,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6986,6 +7000,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7004,6 +7019,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7506,6 +7522,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7748,6 +7765,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7938,6 +7956,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8149,6 +8168,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index eab92ecdca4..1159d8f6fd9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -776,6 +776,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1756,6 +1757,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; @@ -3003,6 +3005,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3179,6 +3182,7 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = dontDistribute super."fft"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -3465,6 +3469,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4357,6 +4362,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgettext" = dontDistribute super."hgettext"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; @@ -4731,6 +4737,7 @@ self: super: { "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -5023,6 +5030,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5251,6 +5259,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5881,6 +5890,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5931,6 +5941,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_14"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -6112,6 +6123,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6562,6 +6574,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6641,6 +6654,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_3"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6984,6 +6998,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -7002,6 +7017,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7504,6 +7520,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; @@ -7746,6 +7763,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7936,6 +7954,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -8147,6 +8166,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index 9dd5ce82db0..b3ee73d5bd4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -763,6 +764,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1728,6 +1730,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; @@ -2010,6 +2013,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2954,6 +2958,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3126,6 +3131,8 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = doDistribute super."fft_0_1_8_2"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3407,6 +3414,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4286,6 +4294,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4645,6 +4654,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4924,6 +4934,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_2"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5142,6 +5153,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5756,6 +5768,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5804,6 +5817,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5981,6 +5995,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6411,6 +6426,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6489,6 +6505,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6820,6 +6837,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6838,6 +6856,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7328,6 +7347,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_0_1"; @@ -7563,6 +7583,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7748,6 +7769,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_11_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7926,6 +7948,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7955,6 +7978,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 14bf0721a42..5a42ee14300 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -763,6 +764,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1727,6 +1729,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; @@ -2009,6 +2012,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2952,6 +2956,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3123,6 +3128,8 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = doDistribute super."fft_0_1_8_2"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3404,6 +3411,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4283,6 +4291,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4642,6 +4651,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4918,6 +4928,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5135,6 +5146,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5747,6 +5759,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5795,6 +5808,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5972,6 +5986,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6402,6 +6417,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6480,6 +6496,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6811,6 +6828,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6829,6 +6847,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7319,6 +7338,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_0_1"; @@ -7554,6 +7574,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7739,6 +7760,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_11_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7917,6 +7939,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7946,6 +7969,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix index f4b4ed74e0d..f8a60a4d4ee 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -763,6 +764,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1727,6 +1729,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; @@ -2007,6 +2010,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2948,6 +2952,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3116,6 +3121,8 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = doDistribute super."fft_0_1_8_2"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3396,6 +3403,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4270,6 +4278,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4628,6 +4637,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4903,6 +4913,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5119,6 +5130,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5731,6 +5743,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5779,6 +5792,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_17"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5954,6 +5968,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6384,6 +6399,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6462,6 +6478,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6790,6 +6807,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6808,6 +6826,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7296,6 +7315,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_0_1"; @@ -7527,6 +7547,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7711,6 +7732,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_11_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -7889,6 +7911,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7918,6 +7941,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8666,6 +8690,7 @@ self: super: { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = doDistribute super."wai-middleware-content-type_0_2_0"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix index 79ddd3344d4..404ed64c7d4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -759,6 +760,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1717,6 +1719,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1996,6 +1999,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2927,6 +2931,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3094,6 +3099,8 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = doDistribute super."fft_0_1_8_2"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3373,6 +3380,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4241,6 +4249,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4599,6 +4608,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4873,6 +4883,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5088,6 +5099,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5697,6 +5709,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5745,6 +5758,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_17"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5920,6 +5934,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6346,6 +6361,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6424,6 +6440,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6749,6 +6766,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6767,6 +6785,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7250,6 +7269,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_0_1"; @@ -7479,6 +7499,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7663,6 +7684,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7838,6 +7860,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7867,6 +7890,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8608,6 +8632,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix index a4e2b2a8d75..a053d42419d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -758,6 +759,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1715,6 +1717,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1993,6 +1996,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2923,6 +2927,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3090,6 +3095,8 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = doDistribute super."fft_0_1_8_2"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3369,6 +3376,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4237,6 +4245,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4595,6 +4604,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4868,6 +4878,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -5083,6 +5094,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5692,6 +5704,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5739,6 +5752,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_17"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5914,6 +5928,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6340,6 +6355,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6418,6 +6434,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6743,6 +6760,7 @@ self: super: { "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6761,6 +6779,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7243,6 +7262,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7472,6 +7492,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7656,6 +7677,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7831,6 +7853,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7860,6 +7883,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8600,6 +8624,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix index 4099b5a4144..471a638f1e1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -754,6 +755,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1708,6 +1710,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1983,6 +1986,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2025,6 +2029,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_14"; "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_10"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2901,6 +2907,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3063,6 +3070,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3340,6 +3349,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4204,6 +4214,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4558,6 +4569,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4828,6 +4840,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4869,6 +4882,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5041,6 +5055,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5641,6 +5656,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5686,6 +5702,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5860,6 +5877,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5886,6 +5904,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6275,6 +6294,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6351,6 +6371,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6675,6 +6696,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6693,6 +6715,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7172,6 +7195,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7399,6 +7423,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7580,6 +7605,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7754,6 +7780,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7783,6 +7810,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8517,6 +8545,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix index 41358159978..55a176c26cf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -753,6 +754,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1598,6 +1600,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1705,6 +1708,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1980,6 +1984,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2022,6 +2027,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_14"; "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_10"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2898,6 +2905,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3059,6 +3067,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3336,6 +3346,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4200,6 +4211,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4550,6 +4562,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4819,6 +4832,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4860,6 +4874,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5032,6 +5047,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5632,6 +5648,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5677,6 +5694,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5851,6 +5869,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5877,6 +5896,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6266,6 +6286,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6342,6 +6363,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6665,6 +6687,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6683,6 +6706,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7162,6 +7186,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7389,6 +7414,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7570,6 +7596,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7744,6 +7771,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7773,6 +7801,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8503,6 +8532,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix index 3fc49a72614..9ed38cd9f39 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -752,6 +753,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1597,6 +1599,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1704,6 +1707,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1979,6 +1983,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2021,6 +2026,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2896,6 +2903,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3056,6 +3064,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3333,6 +3343,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4197,6 +4208,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4547,6 +4559,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4815,6 +4828,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4856,6 +4870,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5028,6 +5043,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5624,6 +5640,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5668,6 +5685,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5842,6 +5860,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5868,6 +5887,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6257,6 +6277,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6333,6 +6354,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6656,6 +6678,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6674,6 +6697,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7153,6 +7177,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7379,6 +7404,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7560,6 +7586,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7734,6 +7761,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7763,6 +7791,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8493,6 +8522,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix index e4132c55105..cf6869ea157 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -752,6 +753,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1593,6 +1595,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1700,6 +1703,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1975,6 +1979,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2017,6 +2022,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2892,6 +2899,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3052,6 +3060,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3329,6 +3339,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4193,6 +4204,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4543,6 +4555,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4811,6 +4824,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4852,6 +4866,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5023,6 +5038,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5618,6 +5634,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5662,6 +5679,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5836,6 +5854,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5862,6 +5881,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6250,6 +6270,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6326,6 +6347,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6649,6 +6671,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6667,6 +6690,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7146,6 +7170,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7372,6 +7397,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7553,6 +7579,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_3"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7727,6 +7754,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7756,6 +7784,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8484,6 +8513,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.14.nix b/pkgs/development/haskell-modules/configuration-lts-5.14.nix index 37e420e1d4e..5e4bedf16ce 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.14.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -750,6 +751,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1589,6 +1591,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1695,6 +1698,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1969,6 +1973,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2011,6 +2016,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2884,6 +2891,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3044,6 +3052,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3319,6 +3329,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4183,6 +4194,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4212,6 +4224,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4532,6 +4545,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4800,6 +4814,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4841,6 +4856,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5012,6 +5028,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5605,6 +5622,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5649,6 +5667,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5823,6 +5842,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5849,6 +5869,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6236,6 +6257,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6312,6 +6334,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6634,6 +6657,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6652,6 +6676,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7131,6 +7156,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7357,6 +7383,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7538,6 +7565,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_3"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7712,6 +7740,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7741,6 +7770,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8465,6 +8495,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.15.nix b/pkgs/development/haskell-modules/configuration-lts-5.15.nix index 98d945acf55..6a07e3349ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.15.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -749,6 +750,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1588,6 +1590,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1694,6 +1697,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1968,6 +1972,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2010,6 +2015,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2880,6 +2887,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3039,6 +3047,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3314,6 +3324,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4176,6 +4187,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4205,6 +4217,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4525,6 +4538,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4793,6 +4807,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4834,6 +4849,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5005,6 +5021,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5597,6 +5614,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5641,6 +5659,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5815,6 +5834,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5841,6 +5861,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6228,6 +6249,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6304,6 +6326,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6624,6 +6647,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6642,6 +6666,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7121,6 +7146,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7347,6 +7373,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7528,6 +7555,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_3"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7702,6 +7730,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7731,6 +7760,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8453,6 +8483,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.16.nix b/pkgs/development/haskell-modules/configuration-lts-5.16.nix index d8e8421c045..39bf0c4feca 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.16.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -748,6 +749,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1583,6 +1585,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1689,6 +1692,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1962,6 +1966,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2004,6 +2009,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2870,6 +2877,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3029,6 +3037,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3304,6 +3314,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4164,6 +4175,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4193,6 +4205,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4513,6 +4526,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4781,6 +4795,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4822,6 +4837,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4992,6 +5008,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5583,6 +5600,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5627,6 +5645,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5800,6 +5819,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5826,6 +5846,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6213,6 +6234,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6288,6 +6310,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6606,6 +6629,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6624,6 +6648,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7099,6 +7124,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7325,6 +7351,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7502,6 +7529,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_1"; "stackage-curator" = doDistribute super."stackage-curator_0_13_3"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7676,6 +7704,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7705,6 +7734,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8425,6 +8455,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.17.nix b/pkgs/development/haskell-modules/configuration-lts-5.17.nix index 3da09e186d9..621520b85a1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.17.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -745,6 +746,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1580,6 +1582,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1686,6 +1689,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1959,6 +1963,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2001,6 +2006,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2867,6 +2874,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3026,6 +3034,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3301,6 +3311,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4161,6 +4172,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4190,6 +4202,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4510,6 +4523,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4778,6 +4792,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4819,6 +4834,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4989,6 +5005,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5580,6 +5597,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5624,6 +5642,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5797,6 +5816,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5823,6 +5843,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6208,6 +6229,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6283,6 +6305,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6601,6 +6624,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6619,6 +6643,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7093,6 +7118,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7319,6 +7345,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7496,6 +7523,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_1"; "stackage-curator" = doDistribute super."stackage-curator_0_13_3"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7669,6 +7697,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7698,6 +7727,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8416,6 +8446,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.18.nix b/pkgs/development/haskell-modules/configuration-lts-5.18.nix index f3ed1e1b470..84b99562844 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.18.nix @@ -215,6 +215,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -744,6 +745,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1579,6 +1581,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1685,6 +1688,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1957,6 +1961,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1999,6 +2004,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2044,6 +2051,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2860,6 +2868,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3018,6 +3027,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3292,6 +3303,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4152,6 +4164,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4180,6 +4193,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4500,6 +4514,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4612,6 +4627,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0"; @@ -4765,6 +4781,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4806,6 +4823,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4976,6 +4994,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5567,6 +5586,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5610,6 +5630,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5781,6 +5802,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5807,6 +5829,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6190,6 +6213,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6265,6 +6289,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6582,6 +6607,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6600,6 +6626,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7074,6 +7101,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7300,6 +7328,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7477,6 +7506,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_1"; "stackage-curator" = doDistribute super."stackage-curator_0_13_3"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7650,6 +7680,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7679,6 +7710,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8395,6 +8427,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix index eda095a330c..baa3ca60045 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -758,6 +759,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1715,6 +1717,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1993,6 +1996,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2922,6 +2926,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3088,6 +3093,8 @@ self: super: { "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fft" = doDistribute super."fft_0_1_8_2"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3367,6 +3374,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4234,6 +4242,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4592,6 +4601,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4865,6 +4875,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4906,6 +4917,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5079,6 +5091,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5688,6 +5701,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5734,6 +5748,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5909,6 +5924,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6332,6 +6348,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6410,6 +6427,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6734,6 +6752,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6752,6 +6771,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7233,6 +7253,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7462,6 +7483,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; @@ -7646,6 +7668,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7820,6 +7843,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7849,6 +7873,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8589,6 +8614,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix index ab577fde58b..9e7dc58b02f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -757,6 +758,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1713,6 +1715,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1991,6 +1994,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2917,6 +2921,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3080,6 +3085,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3359,6 +3366,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4226,6 +4234,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4584,6 +4593,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4856,6 +4866,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4897,6 +4908,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5070,6 +5082,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5677,6 +5690,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5723,6 +5737,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5898,6 +5913,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6320,6 +6336,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6398,6 +6415,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6722,6 +6740,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6740,6 +6759,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7219,6 +7239,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7448,6 +7469,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7630,6 +7652,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7804,6 +7827,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7833,6 +7857,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8572,6 +8597,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix index e61030058bb..9958638e5d8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -756,6 +757,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1712,6 +1714,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1990,6 +1993,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2912,6 +2916,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3074,6 +3079,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3353,6 +3360,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4219,6 +4227,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4577,6 +4586,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4849,6 +4859,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4890,6 +4901,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5063,6 +5075,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5669,6 +5682,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5715,6 +5729,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5889,6 +5904,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6309,6 +6325,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6386,6 +6403,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6710,6 +6728,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6728,6 +6747,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7207,6 +7227,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7436,6 +7457,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7618,6 +7640,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7792,6 +7815,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7821,6 +7845,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8559,6 +8584,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix index 216beaa5e1e..fa0a0ca22b0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -756,6 +757,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1712,6 +1714,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1989,6 +1992,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2911,6 +2915,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3073,6 +3078,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3352,6 +3359,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4218,6 +4226,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4575,6 +4584,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4847,6 +4857,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4888,6 +4899,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5061,6 +5073,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5667,6 +5680,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5713,6 +5727,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5887,6 +5902,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -6307,6 +6323,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6384,6 +6401,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6708,6 +6726,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6726,6 +6745,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7205,6 +7225,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7434,6 +7455,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7616,6 +7638,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7790,6 +7813,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7819,6 +7843,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8556,6 +8581,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix index a54dcb147c6..fbb74743fdc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -755,6 +756,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1711,6 +1713,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1988,6 +1991,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2909,6 +2913,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3071,6 +3076,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3348,6 +3355,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4213,6 +4221,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4570,6 +4579,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4842,6 +4852,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4883,6 +4894,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5056,6 +5068,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5660,6 +5673,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5706,6 +5720,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5880,6 +5895,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5906,6 +5922,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6299,6 +6316,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6375,6 +6393,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6699,6 +6718,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6717,6 +6737,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7196,6 +7217,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7425,6 +7447,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7607,6 +7630,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7781,6 +7805,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7810,6 +7835,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8546,6 +8572,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix index 4c26b8ecf88..72b0fd87324 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -755,6 +756,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1711,6 +1713,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1987,6 +1990,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2029,6 +2033,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_11"; "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_8"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2906,6 +2912,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3068,6 +3075,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3345,6 +3354,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4210,6 +4220,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4566,6 +4577,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4838,6 +4850,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4879,6 +4892,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5052,6 +5066,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5655,6 +5670,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5701,6 +5717,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5875,6 +5892,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5901,6 +5919,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6294,6 +6313,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6370,6 +6390,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6694,6 +6715,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6712,6 +6734,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7191,6 +7214,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7420,6 +7444,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7602,6 +7627,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7776,6 +7802,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7805,6 +7832,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8540,6 +8568,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix index 1ef3e83698f..e4242c69618 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -755,6 +756,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1711,6 +1713,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1987,6 +1990,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2029,6 +2033,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_11"; "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_8"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2906,6 +2912,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3068,6 +3075,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3345,6 +3354,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4210,6 +4220,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4566,6 +4577,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4838,6 +4850,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4879,6 +4892,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5052,6 +5066,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5655,6 +5670,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5701,6 +5717,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5875,6 +5892,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5901,6 +5919,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6294,6 +6313,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6370,6 +6390,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6694,6 +6715,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6712,6 +6734,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7191,6 +7214,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7420,6 +7444,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7602,6 +7627,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7776,6 +7802,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7805,6 +7832,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8540,6 +8568,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix index 26420ddae5c..51215a0b36b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix @@ -216,6 +216,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -755,6 +756,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1710,6 +1712,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound" = dontDistribute super."bloodhound"; @@ -1985,6 +1988,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -2027,6 +2031,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_14"; "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_10"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2903,6 +2909,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envelope" = dontDistribute super."envelope"; "envparse" = dontDistribute super."envparse"; @@ -3065,6 +3072,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3342,6 +3351,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -4206,6 +4216,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4562,6 +4573,7 @@ self: super: { "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4832,6 +4844,7 @@ self: super: { "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; "ini" = doDistribute super."ini_0_3_4"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4873,6 +4886,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -5045,6 +5059,7 @@ self: super: { "katip" = dontDistribute super."katip"; "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5648,6 +5663,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5694,6 +5710,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5868,6 +5885,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = dontDistribute super."names-th"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-erl" = dontDistribute super."nano-erl"; "nano-hmac" = dontDistribute super."nano-hmac"; @@ -5894,6 +5912,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -6284,6 +6303,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permutation" = dontDistribute super."permutation"; "permute" = dontDistribute super."permute"; @@ -6360,6 +6380,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6684,6 +6705,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6702,6 +6724,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -7181,6 +7204,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7408,6 +7432,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = doDistribute super."smsaero_0_4_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtLib" = doDistribute super."smtLib_1_0_7"; @@ -7589,6 +7614,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_0"; "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7763,6 +7789,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7792,6 +7819,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8526,6 +8554,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.0.nix b/pkgs/development/haskell-modules/configuration-lts-6.0.nix index d4442d43a24..d073a0dc9eb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.0.nix @@ -214,6 +214,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -711,6 +712,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -738,6 +740,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1552,6 +1555,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1658,6 +1662,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; @@ -1923,6 +1928,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1965,6 +1971,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -2008,6 +2016,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2795,6 +2804,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; "epanet-haskell" = dontDistribute super."epanet-haskell"; @@ -2947,6 +2957,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3213,6 +3225,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -3903,6 +3916,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; @@ -4051,6 +4065,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4079,6 +4094,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4390,6 +4406,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4500,6 +4517,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-dejafu" = doDistribute super."hunit-dejafu_0_3_0_0"; @@ -4517,6 +4535,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; @@ -4647,6 +4666,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4687,6 +4707,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4854,6 +4875,7 @@ self: super: { "karver" = dontDistribute super."karver"; "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_0_0"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5426,6 +5448,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5469,6 +5492,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5634,6 +5658,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = doDistribute super."names-th_0_2_0_1"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-hmac" = dontDistribute super."nano-hmac"; "nano-md5" = dontDistribute super."nano-md5"; @@ -5658,6 +5683,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5996,6 +6022,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "path" = doDistribute super."path_0_5_7"; + "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -6036,6 +6063,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; @@ -6111,6 +6139,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; @@ -6416,6 +6445,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6434,6 +6464,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -6487,6 +6518,7 @@ self: super: { "rasterific-svg" = doDistribute super."rasterific-svg_0_3_1_1"; "rate-limit" = dontDistribute super."rate-limit"; "ratel" = doDistribute super."ratel_0_1_3"; + "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6889,6 +6921,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7099,6 +7132,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7273,6 +7307,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_1"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7380,6 +7415,7 @@ self: super: { "stripe-core" = doDistribute super."stripe-core_2_0_3"; "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; + "strive" = doDistribute super."strive_2_2_2"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7439,6 +7475,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7468,6 +7505,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8158,6 +8196,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.1.nix b/pkgs/development/haskell-modules/configuration-lts-6.1.nix index d9d6fe893c2..1eca54977b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.1.nix @@ -214,6 +214,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -709,6 +710,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -736,6 +738,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1549,6 +1552,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1654,6 +1658,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; @@ -1911,6 +1916,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1953,6 +1959,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -1996,6 +2004,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2776,6 +2785,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; "epanet-haskell" = dontDistribute super."epanet-haskell"; @@ -2926,6 +2936,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3188,6 +3200,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -3873,6 +3886,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; @@ -4019,6 +4033,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4046,6 +4061,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4355,6 +4371,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4465,6 +4482,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4481,6 +4499,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; @@ -4611,6 +4630,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4651,6 +4671,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4815,6 +4836,7 @@ self: super: { "karver" = dontDistribute super."karver"; "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_0_0"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5383,6 +5405,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5425,6 +5448,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5589,6 +5613,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = doDistribute super."names-th_0_2_0_1"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-hmac" = dontDistribute super."nano-hmac"; "nano-md5" = dontDistribute super."nano-md5"; @@ -5613,6 +5638,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5948,6 +5974,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "path" = doDistribute super."path_0_5_7"; + "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5988,6 +6015,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; @@ -6063,6 +6091,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; "pipes-courier" = dontDistribute super."pipes-courier"; @@ -6360,6 +6389,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6378,6 +6408,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -6431,6 +6462,7 @@ self: super: { "rasterific-svg" = doDistribute super."rasterific-svg_0_3_1_1"; "rate-limit" = dontDistribute super."rate-limit"; "ratel" = doDistribute super."ratel_0_1_3"; + "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6831,6 +6863,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7041,6 +7074,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7215,6 +7249,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_1"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7321,6 +7356,7 @@ self: super: { "stripe-core" = doDistribute super."stripe-core_2_0_3"; "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; + "strive" = doDistribute super."strive_2_2_2"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7380,6 +7416,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7409,6 +7446,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8094,6 +8132,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.2.nix b/pkgs/development/haskell-modules/configuration-lts-6.2.nix index 3b5eaf8b11c..ec18f66711d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.2.nix @@ -213,6 +213,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -705,6 +706,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -732,6 +734,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1541,6 +1544,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1646,6 +1650,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; @@ -1902,6 +1907,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1944,6 +1950,8 @@ self: super: { "clash-lib" = doDistribute super."clash-lib_0_6_15"; "clash-prelude" = doDistribute super."clash-prelude_0_10_7"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; @@ -1987,6 +1995,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2764,6 +2773,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; "epanet-haskell" = dontDistribute super."epanet-haskell"; @@ -2913,6 +2923,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3172,6 +3184,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -3853,6 +3866,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; @@ -3997,6 +4011,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -4024,6 +4039,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4333,6 +4349,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4442,6 +4459,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4458,6 +4476,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; @@ -4587,6 +4606,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4627,6 +4647,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4790,6 +4811,7 @@ self: super: { "karver" = dontDistribute super."karver"; "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_0_0"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5357,6 +5379,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5399,6 +5422,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5562,6 +5586,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = doDistribute super."names-th_0_2_0_1"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-hmac" = dontDistribute super."nano-hmac"; "nano-md5" = dontDistribute super."nano-md5"; @@ -5586,6 +5611,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5917,6 +5943,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "path" = doDistribute super."path_0_5_7"; + "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5956,6 +5983,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; @@ -6030,6 +6058,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; "pipes-courier" = dontDistribute super."pipes-courier"; @@ -6327,6 +6356,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6345,6 +6375,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -6395,6 +6426,7 @@ self: super: { "rascal" = dontDistribute super."rascal"; "rate-limit" = dontDistribute super."rate-limit"; "ratel" = doDistribute super."ratel_0_1_3"; + "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6579,6 +6611,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_7_4"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6792,6 +6825,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -7001,6 +7035,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7175,6 +7210,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_2"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7279,6 +7315,7 @@ self: super: { "stripe-core" = doDistribute super."stripe-core_2_0_3"; "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; + "strive" = doDistribute super."strive_2_2_2"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7337,6 +7374,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7366,6 +7404,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -8049,6 +8088,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.3.nix b/pkgs/development/haskell-modules/configuration-lts-6.3.nix index 855f6aca367..ef66bb58926 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.3.nix @@ -213,6 +213,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -704,6 +705,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -731,6 +733,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1463,6 +1466,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1568,6 +1572,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; @@ -1616,6 +1621,7 @@ self: super: { "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson" = doDistribute super."bson_0_3_2_2"; "bson-generic" = dontDistribute super."bson-generic"; "bson-generics" = dontDistribute super."bson-generics"; "bson-mapping" = dontDistribute super."bson-mapping"; @@ -1822,6 +1828,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1860,7 +1867,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_19"; + "clash-lib" = doDistribute super."clash-lib_0_6_17"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_9"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_13"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_7"; @@ -1901,6 +1914,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2670,6 +2684,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; "epanet-haskell" = dontDistribute super."epanet-haskell"; @@ -2819,6 +2834,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3078,6 +3095,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -3755,6 +3773,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; @@ -3898,6 +3917,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -3925,6 +3945,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4232,6 +4253,7 @@ self: super: { "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4338,6 +4360,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4354,6 +4377,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; @@ -4483,6 +4507,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4523,6 +4548,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4683,6 +4709,7 @@ self: super: { "karakuri" = dontDistribute super."karakuri"; "karver" = dontDistribute super."karver"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5249,6 +5276,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5291,6 +5319,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5452,6 +5481,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = doDistribute super."names-th_0_2_0_1"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-hmac" = dontDistribute super."nano-hmac"; "nano-md5" = dontDistribute super."nano-md5"; @@ -5476,6 +5506,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5806,6 +5837,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "path" = doDistribute super."path_0_5_7"; + "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5845,6 +5877,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; @@ -5918,6 +5951,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; "pipes-courier" = dontDistribute super."pipes-courier"; @@ -6211,6 +6245,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6229,6 +6264,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -6279,6 +6315,7 @@ self: super: { "rascal" = dontDistribute super."rascal"; "rate-limit" = dontDistribute super."rate-limit"; "ratel" = doDistribute super."ratel_0_1_3"; + "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6462,6 +6499,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_7_4"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6674,6 +6712,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -6883,6 +6922,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7056,6 +7096,7 @@ self: super: { "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7159,6 +7200,7 @@ self: super: { "stripe-core" = doDistribute super."stripe-core_2_0_3"; "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; + "strive" = doDistribute super."strive_2_2_2"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7216,6 +7258,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7245,6 +7288,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -7920,6 +7964,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.4.nix b/pkgs/development/haskell-modules/configuration-lts-6.4.nix index f81089bf70c..77ca194e448 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.4.nix @@ -213,6 +213,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -703,6 +704,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -730,6 +732,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1461,6 +1464,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1566,6 +1570,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; @@ -1614,6 +1619,7 @@ self: super: { "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson" = doDistribute super."bson_0_3_2_2"; "bson-generic" = dontDistribute super."bson-generic"; "bson-generics" = dontDistribute super."bson-generics"; "bson-mapping" = dontDistribute super."bson-mapping"; @@ -1819,6 +1825,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1857,7 +1864,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_19"; + "clash-lib" = doDistribute super."clash-lib_0_6_17"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_9"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_13"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; @@ -1898,6 +1911,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2661,6 +2675,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; "epanet-haskell" = dontDistribute super."epanet-haskell"; @@ -2809,6 +2824,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3068,6 +3085,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -3745,6 +3763,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; @@ -3888,6 +3907,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -3915,6 +3935,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4220,6 +4241,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4325,6 +4347,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4341,6 +4364,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; @@ -4470,6 +4494,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4510,6 +4535,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4670,6 +4696,7 @@ self: super: { "karakuri" = dontDistribute super."karakuri"; "karver" = dontDistribute super."karver"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5235,6 +5262,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5277,6 +5305,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5321,6 +5350,7 @@ self: super: { "mono-traversable" = doDistribute super."mono-traversable_0_10_2"; "mono-traversable-instances" = dontDistribute super."mono-traversable-instances"; "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-extras" = doDistribute super."monoid-extras_0_4_1_2"; "monoid-owns" = dontDistribute super."monoid-owns"; "monoid-record" = dontDistribute super."monoid-record"; "monoid-statistics" = dontDistribute super."monoid-statistics"; @@ -5436,6 +5466,7 @@ self: super: { "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; "names-th" = doDistribute super."names-th_0_2_0_1"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-hmac" = dontDistribute super."nano-hmac"; "nano-md5" = dontDistribute super."nano-md5"; @@ -5459,6 +5490,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5786,6 +5818,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5825,6 +5858,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; @@ -5898,6 +5932,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; "pipes-courier" = dontDistribute super."pipes-courier"; @@ -6191,6 +6226,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6209,6 +6245,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -6259,6 +6296,7 @@ self: super: { "rascal" = dontDistribute super."rascal"; "rate-limit" = dontDistribute super."rate-limit"; "ratel" = doDistribute super."ratel_0_1_3"; + "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6439,6 +6477,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_7_4"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6651,6 +6690,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -6858,6 +6898,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7031,6 +7072,7 @@ self: super: { "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7132,6 +7174,7 @@ self: super: { "stripe-core" = doDistribute super."stripe-core_2_0_3"; "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; + "strive" = doDistribute super."strive_2_2_2"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7189,6 +7232,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7218,6 +7262,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -7891,6 +7936,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.5.nix b/pkgs/development/haskell-modules/configuration-lts-6.5.nix index 3547508f8c5..45ede8fa435 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.5.nix @@ -213,6 +213,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -701,6 +702,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -728,6 +730,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1458,6 +1461,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1563,6 +1567,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; @@ -1611,6 +1616,7 @@ self: super: { "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson" = doDistribute super."bson_0_3_2_2"; "bson-generic" = dontDistribute super."bson-generic"; "bson-generics" = dontDistribute super."bson-generics"; "bson-mapping" = dontDistribute super."bson-mapping"; @@ -1815,6 +1821,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1853,7 +1860,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_19"; + "clash-lib" = doDistribute super."clash-lib_0_6_17"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_9"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_13"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; @@ -1893,6 +1906,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2653,6 +2667,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; "epanet-haskell" = dontDistribute super."epanet-haskell"; @@ -2801,6 +2816,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3060,6 +3077,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -3735,6 +3753,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; @@ -3878,6 +3897,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -3905,6 +3925,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4209,6 +4230,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4314,6 +4336,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4330,6 +4353,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; @@ -4459,6 +4483,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4499,6 +4524,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4658,6 +4684,7 @@ self: super: { "karakuri" = dontDistribute super."karakuri"; "karver" = dontDistribute super."karver"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5220,6 +5247,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5262,6 +5290,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5306,6 +5335,7 @@ self: super: { "mono-traversable" = doDistribute super."mono-traversable_0_10_2"; "mono-traversable-instances" = dontDistribute super."mono-traversable-instances"; "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-extras" = doDistribute super."monoid-extras_0_4_1_2"; "monoid-owns" = dontDistribute super."monoid-owns"; "monoid-record" = dontDistribute super."monoid-record"; "monoid-statistics" = dontDistribute super."monoid-statistics"; @@ -5419,6 +5449,7 @@ self: super: { "named-records" = dontDistribute super."named-records"; "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-hmac" = dontDistribute super."nano-hmac"; "nano-md5" = dontDistribute super."nano-md5"; @@ -5442,6 +5473,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5769,6 +5801,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5808,6 +5841,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; @@ -5878,6 +5912,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; "pipes-courier" = dontDistribute super."pipes-courier"; @@ -6171,6 +6206,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6187,6 +6223,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -6237,6 +6274,7 @@ self: super: { "rascal" = dontDistribute super."rascal"; "rate-limit" = dontDistribute super."rate-limit"; "ratel" = doDistribute super."ratel_0_1_3"; + "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6355,6 +6393,7 @@ self: super: { "relacion" = dontDistribute super."relacion"; "relation" = dontDistribute super."relation"; "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = doDistribute super."relational-query_0_8_2_3"; "relational-record-examples" = dontDistribute super."relational-record-examples"; "relative-date" = dontDistribute super."relative-date"; "relit" = dontDistribute super."relit"; @@ -6414,6 +6453,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_7_4"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6626,6 +6666,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -6830,6 +6871,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7002,6 +7044,7 @@ self: super: { "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7102,6 +7145,7 @@ self: super: { "stripe-core" = doDistribute super."stripe-core_2_0_3"; "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; + "strive" = doDistribute super."strive_2_2_2"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7158,6 +7202,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7187,6 +7232,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -7852,6 +7898,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.6.nix b/pkgs/development/haskell-modules/configuration-lts-6.6.nix index 017412c76ba..01d91f7b3d8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.6.nix @@ -212,6 +212,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -357,6 +358,7 @@ self: super: { "GiST" = dontDistribute super."GiST"; "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "Glob" = doDistribute super."Glob_0_7_9"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; "GlomeView" = dontDistribute super."GlomeView"; @@ -698,6 +700,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -725,6 +728,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1440,6 +1444,7 @@ self: super: { "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-list" = doDistribute super."binary-list_1_1_1_1"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-orphans" = doDistribute super."binary-orphans_0_1_5_0"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-state" = dontDistribute super."binary-state"; @@ -1453,6 +1458,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1558,6 +1564,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; @@ -1606,6 +1613,7 @@ self: super: { "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson" = doDistribute super."bson_0_3_2_2"; "bson-generic" = dontDistribute super."bson-generic"; "bson-generics" = dontDistribute super."bson-generics"; "bson-mapping" = dontDistribute super."bson-mapping"; @@ -1810,6 +1818,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1848,7 +1857,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_19"; + "clash-lib" = doDistribute super."clash-lib_0_6_17"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_9"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_13"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; @@ -1888,6 +1903,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2648,6 +2664,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; "epanet-haskell" = dontDistribute super."epanet-haskell"; @@ -2796,6 +2813,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3055,6 +3074,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -3730,6 +3750,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; @@ -3873,6 +3894,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -3899,6 +3921,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4203,6 +4226,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4307,6 +4331,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4323,6 +4348,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; @@ -4452,6 +4478,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4492,6 +4519,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4651,6 +4679,7 @@ self: super: { "karakuri" = dontDistribute super."karakuri"; "karver" = dontDistribute super."karver"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5175,6 +5204,8 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_8_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_3_2_0"; "micrologger" = dontDistribute super."micrologger"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; @@ -5209,6 +5240,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5251,6 +5283,7 @@ self: super: { "monad-log" = dontDistribute super."monad-log"; "monad-logger" = doDistribute super."monad-logger_0_3_18"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5295,6 +5328,7 @@ self: super: { "mono-traversable" = doDistribute super."mono-traversable_0_10_2"; "mono-traversable-instances" = dontDistribute super."mono-traversable-instances"; "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-extras" = doDistribute super."monoid-extras_0_4_1_2"; "monoid-owns" = dontDistribute super."monoid-owns"; "monoid-record" = dontDistribute super."monoid-record"; "monoid-statistics" = dontDistribute super."monoid-statistics"; @@ -5408,6 +5442,7 @@ self: super: { "named-records" = dontDistribute super."named-records"; "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-hmac" = dontDistribute super."nano-hmac"; "nano-md5" = dontDistribute super."nano-md5"; @@ -5431,6 +5466,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5757,6 +5793,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5796,6 +5833,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; @@ -5866,6 +5904,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; "pipes-courier" = dontDistribute super."pipes-courier"; @@ -6157,6 +6196,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6173,6 +6213,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -6223,6 +6264,7 @@ self: super: { "rascal" = dontDistribute super."rascal"; "rate-limit" = dontDistribute super."rate-limit"; "ratel" = doDistribute super."ratel_0_1_3"; + "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6341,6 +6383,7 @@ self: super: { "relacion" = dontDistribute super."relacion"; "relation" = dontDistribute super."relation"; "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = doDistribute super."relational-query_0_8_2_3"; "relational-record-examples" = dontDistribute super."relational-record-examples"; "relative-date" = dontDistribute super."relative-date"; "relit" = dontDistribute super."relit"; @@ -6400,6 +6443,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_7_4"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6612,6 +6656,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -6814,6 +6859,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -6986,6 +7032,7 @@ self: super: { "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7086,6 +7133,7 @@ self: super: { "stripe-core" = doDistribute super."stripe-core_2_0_3"; "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; + "strive" = doDistribute super."strive_2_2_2"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7142,6 +7190,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7171,6 +7220,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -7835,6 +7885,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.7.nix b/pkgs/development/haskell-modules/configuration-lts-6.7.nix index afbe25cc30d..fc4aab41a65 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.7.nix @@ -212,6 +212,7 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -357,6 +358,7 @@ self: super: { "GiST" = dontDistribute super."GiST"; "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "Glob" = doDistribute super."Glob_0_7_9"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; "GlomeView" = dontDistribute super."GlomeView"; @@ -698,6 +700,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -725,6 +728,7 @@ self: super: { "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; "PasswordGenerator" = dontDistribute super."PasswordGenerator"; "PastePipe" = dontDistribute super."PastePipe"; + "PathTree" = dontDistribute super."PathTree"; "Pathfinder" = dontDistribute super."Pathfinder"; "Peano" = dontDistribute super."Peano"; "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; @@ -1436,6 +1440,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-orphans" = doDistribute super."binary-orphans_0_1_5_0"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-state" = dontDistribute super."binary-state"; @@ -1449,6 +1454,7 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1554,6 +1560,7 @@ self: super: { "blink1" = dontDistribute super."blink1"; "blip" = dontDistribute super."blip"; "bliplib" = dontDistribute super."bliplib"; + "blockhash" = dontDistribute super."blockhash"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; @@ -1601,6 +1608,7 @@ self: super: { "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson" = doDistribute super."bson_0_3_2_2"; "bson-generic" = dontDistribute super."bson-generic"; "bson-generics" = dontDistribute super."bson-generics"; "bson-mapping" = dontDistribute super."bson-mapping"; @@ -1805,6 +1813,7 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; + "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1843,7 +1852,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_19"; + "clash-lib" = doDistribute super."clash-lib_0_6_17"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_9"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_13"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; @@ -1882,6 +1897,7 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; + "cmark" = doDistribute super."cmark_0_5_2_1"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -2638,6 +2654,7 @@ self: super: { "enummapset" = dontDistribute super."enummapset"; "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; + "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; "epanet-haskell" = dontDistribute super."epanet-haskell"; @@ -2785,6 +2802,8 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl" = doDistribute super."fgl_5_5_2_3"; + "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3044,6 +3063,7 @@ self: super: { "genvalidity" = dontDistribute super."genvalidity"; "genvalidity-containers" = dontDistribute super."genvalidity-containers"; "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; + "genvalidity-text" = dontDistribute super."genvalidity-text"; "geo-resolver" = dontDistribute super."geo-resolver"; "geo-uk" = dontDistribute super."geo-uk"; "geocalc" = dontDistribute super."geocalc"; @@ -3082,6 +3102,7 @@ self: super: { "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-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4_2"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3717,6 +3738,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; @@ -3860,6 +3882,7 @@ self: super: { "hgen" = dontDistribute super."hgen"; "hgeometric" = dontDistribute super."hgeometric"; "hgeometry" = dontDistribute super."hgeometry"; + "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; @@ -3886,6 +3909,7 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4190,6 +4214,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "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"; @@ -4291,6 +4316,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4307,6 +4333,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; @@ -4436,6 +4463,7 @@ self: super: { "inflist" = dontDistribute super."inflist"; "influxdb" = dontDistribute super."influxdb"; "informative" = dontDistribute super."informative"; + "ini-qq" = dontDistribute super."ini-qq"; "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; @@ -4475,6 +4503,7 @@ self: super: { "interspersed" = dontDistribute super."interspersed"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; @@ -4634,6 +4663,7 @@ self: super: { "karakuri" = dontDistribute super."karakuri"; "karver" = dontDistribute super."karver"; "katt" = dontDistribute super."katt"; + "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -5157,6 +5187,8 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_8_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_3_2_0"; "micrologger" = dontDistribute super."micrologger"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; @@ -5191,6 +5223,7 @@ self: super: { "miniutter" = dontDistribute super."miniutter"; "minlen" = dontDistribute super."minlen"; "minst-idx" = dontDistribute super."minst-idx"; + "mios" = dontDistribute super."mios"; "mirror-tweet" = dontDistribute super."mirror-tweet"; "missing-py2" = dontDistribute super."missing-py2"; "mix-arrows" = dontDistribute super."mix-arrows"; @@ -5231,6 +5264,7 @@ self: super: { "monad-lgbt" = dontDistribute super."monad-lgbt"; "monad-log" = dontDistribute super."monad-log"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; + "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5275,6 +5309,7 @@ self: super: { "mono-traversable" = doDistribute super."mono-traversable_0_10_2"; "mono-traversable-instances" = dontDistribute super."mono-traversable-instances"; "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-extras" = doDistribute super."monoid-extras_0_4_1_2"; "monoid-owns" = dontDistribute super."monoid-owns"; "monoid-record" = dontDistribute super."monoid-record"; "monoid-statistics" = dontDistribute super."monoid-statistics"; @@ -5387,6 +5422,7 @@ self: super: { "named-records" = dontDistribute super."named-records"; "namelist" = dontDistribute super."namelist"; "names" = dontDistribute super."names"; + "namespace" = dontDistribute super."namespace"; "nano-cryptr" = dontDistribute super."nano-cryptr"; "nano-hmac" = dontDistribute super."nano-hmac"; "nano-md5" = dontDistribute super."nano-md5"; @@ -5410,6 +5446,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5736,6 +5773,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5775,6 +5813,7 @@ self: super: { "perdure" = dontDistribute super."perdure"; "perfecthash" = dontDistribute super."perfecthash"; "period" = dontDistribute super."period"; + "periodic" = dontDistribute super."periodic"; "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; @@ -5844,6 +5883,7 @@ self: super: { "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; "pipes-courier" = dontDistribute super."pipes-courier"; @@ -6133,6 +6173,7 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6149,6 +6190,7 @@ self: super: { "quickterm" = dontDistribute super."quickterm"; "quicktest" = dontDistribute super."quicktest"; "quickwebapp" = dontDistribute super."quickwebapp"; + "quipper" = dontDistribute super."quipper"; "quiver" = dontDistribute super."quiver"; "quiver-binary" = dontDistribute super."quiver-binary"; "quiver-bytestring" = dontDistribute super."quiver-bytestring"; @@ -6199,6 +6241,7 @@ self: super: { "rascal" = dontDistribute super."rascal"; "rate-limit" = dontDistribute super."rate-limit"; "ratel" = doDistribute super."ratel_0_1_3"; + "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6317,6 +6360,7 @@ self: super: { "relacion" = dontDistribute super."relacion"; "relation" = dontDistribute super."relation"; "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = doDistribute super."relational-query_0_8_2_3"; "relational-record-examples" = dontDistribute super."relational-record-examples"; "relative-date" = dontDistribute super."relative-date"; "relit" = dontDistribute super."relit"; @@ -6374,6 +6418,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_7_4"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6586,6 +6631,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semibounded-lattices" = dontDistribute super."semibounded-lattices"; "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_18_1"; @@ -6788,6 +6834,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smerdyakov" = dontDistribute super."smerdyakov"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -6960,6 +7007,7 @@ self: super: { "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; + "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7060,6 +7108,7 @@ self: super: { "stripe-core" = doDistribute super."stripe-core_2_0_3"; "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; + "strive" = doDistribute super."strive_2_2_2"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7116,6 +7165,7 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; + "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7145,6 +7195,7 @@ self: super: { "system-info" = dontDistribute super."system-info"; "system-inotify" = dontDistribute super."system-inotify"; "system-lifted" = dontDistribute super."system-lifted"; + "system-locale" = dontDistribute super."system-locale"; "system-random-effect" = dontDistribute super."system-random-effect"; "system-test" = dontDistribute super."system-test"; "system-time-monotonic" = dontDistribute super."system-time-monotonic"; @@ -7806,6 +7857,7 @@ self: super: { "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-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 01475c0bf26..13057b4c4aa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1469,13 +1469,14 @@ self: { }) {}; "BiGUL" = callPackage - ({ mkDerivation, base, containers, mtl, pretty, template-haskell }: + ({ mkDerivation, base, containers, mtl, template-haskell, th-extras + }: mkDerivation { pname = "BiGUL"; - version = "0.9.0.0"; - sha256 = "4530a12694a213bbbc98a55a7120c7093d92a70892757c30faac0176a4ce9ff7"; + version = "1.0.0"; + sha256 = "f4fe9d078b3f7b3db8d39be54877ff912c0c7f37774a82c728edab713efc6775"; libraryHaskellDepends = [ - base containers mtl pretty template-haskell + base containers mtl template-haskell th-extras ]; jailbreak = true; homepage = "http://www.prg.nii.ac.jp/project/bigul/"; @@ -3978,8 +3979,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Concurrent-Cache"; - version = "0.2.0.0"; - sha256 = "df1d1540e28338609f86baef867704c4df1a2dfb8cf46881ec9227d3433fae3b"; + version = "0.2.1.0"; + sha256 = "4b729f38e34be0f9b9bc51eafd513c1e476a14f4058d4476341db51e6c0ad642"; libraryHaskellDepends = [ base ]; description = "A Cached variable for IO functions"; license = stdenv.lib.licenses.bsd3; @@ -4496,7 +4497,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DAV" = callPackage + "DAV_1_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, http-client, http-client-tls , http-types, lens, mtl, mtl-compat, network, network-uri @@ -4507,6 +4508,8 @@ self: { pname = "DAV"; version = "1.2"; sha256 = "1a07c8ef17cd4207c6f889e7eb5c45d9f025374f2cdacc1e34e6d71fe103b746"; + revision = "1"; + editedCabalFile = "6c084095b369b6a2cb797a19a9accf5488f729f19bb6c0240e0f6faf1ac266bb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4524,6 +4527,37 @@ self: { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "DAV" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, exceptions, haskeline, http-client, http-client-tls + , http-types, lens, mtl, network, network-uri, optparse-applicative + , transformers, transformers-base, transformers-compat, utf8-string + , xml-conduit, xml-hamlet + }: + mkDerivation { + pname = "DAV"; + version = "1.3.1"; + sha256 = "5c80faa58f8bbfb4bbdf7f3db6f23a3a4d26a199831ceb27dd5f69fef21bc009"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers data-default exceptions + http-client http-client-tls http-types lens mtl transformers + transformers-base transformers-compat utf8-string xml-conduit + xml-hamlet + ]; + executableHaskellDepends = [ + base bytestring case-insensitive containers data-default exceptions + haskeline http-client http-client-tls http-types lens mtl network + network-uri optparse-applicative transformers transformers-base + transformers-compat utf8-string xml-conduit xml-hamlet + ]; + homepage = "http://floss.scru.org/hDAV"; + description = "RFC 4918 WebDAV support"; + license = stdenv.lib.licenses.gpl3; }) {}; "DBlimited" = callPackage @@ -7877,7 +7911,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Glob" = callPackage + "Glob_0_7_9" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, transformers-compat @@ -7895,6 +7929,30 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 transformers transformers-compat ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Glob" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.7.10"; + sha256 = "db8f67725566df72379cdbbdb2f7aaf6500163b94924229b4b0aa9bbaa9804a7"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; doCheck = false; homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; @@ -16359,7 +16417,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesa;}; - "OpenGLRaw" = callPackage + "OpenGLRaw_3_2_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, mesa , text, transformers }: @@ -16374,6 +16432,24 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mesa;}; + + "OpenGLRaw" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, mesa + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.2.1.0"; + sha256 = "a1554684460bd34b2e031cfc5f5e5388e6266f67482bd77829575b5b8b339afe"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ mesa ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mesa;}; "OpenGLRaw21" = callPackage @@ -16829,6 +16905,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "PathTree" = callPackage + ({ mkDerivation, base, containers, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "PathTree"; + version = "0.1.1.0"; + sha256 = "18f88853bfe2e2b1a5961765ca4874dc58418dbb480781a9446deca7654918e7"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "https://github.com/pjrt/PathTree#readme"; + description = "A tree used to merge and maintain paths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Pathfinder" = callPackage ({ mkDerivation, base, bytestring, libxml2, text }: mkDerivation { @@ -24914,8 +25008,8 @@ self: { }: mkDerivation { pname = "aeson-diff"; - version = "1.0.0.0"; - sha256 = "5ea558cd2825880fe162418a933077d457cc02eb2cb4bcef48b5b49bef6ca9b1"; + version = "1.0.0.1"; + sha256 = "8a2398f9898138444613c389c29222902a56f0078f5200017bf69cb86de1d76b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24929,7 +25023,6 @@ self: { aeson base bytestring directory filepath Glob hlint QuickCheck quickcheck-instances text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/thsutton/aeson-diff"; description = "Extract and apply patches to JSON documents"; license = stdenv.lib.licenses.bsd3; @@ -43369,6 +43462,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_4" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , QuickCheck, semigroups, tagged, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.4"; + sha256 = "47d5c35c00d743ded8116d598cfc81c88acea11859375709d9b54c94f4e0a26d"; + libraryHaskellDepends = [ + base base-orphans comonad containers semigroups tagged + template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base hspec QuickCheck transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/bifunctors/"; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -43964,7 +44079,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary-orphans" = callPackage + "binary-orphans_0_1_5_0" = callPackage ({ mkDerivation, aeson, base, binary, case-insensitive, hashable , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck , text, text-binary, time, unordered-containers, vector @@ -43987,6 +44102,32 @@ self: { homepage = "https://github.com/phadej/binary-orphans#readme"; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "binary-orphans" = callPackage + ({ mkDerivation, aeson, base, binary, case-insensitive, hashable + , QuickCheck, quickcheck-instances, scientific, tagged, tasty + , tasty-quickcheck, text, text-binary, time, unordered-containers + , vector, vector-binary-instances + }: + mkDerivation { + pname = "binary-orphans"; + version = "0.1.5.1"; + sha256 = "c60442199ad6139654a6a672dc66d321dbe8a23199fb5269ef295b2adc23af4c"; + libraryHaskellDepends = [ + aeson base binary case-insensitive hashable scientific tagged text + text-binary time unordered-containers vector + vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary case-insensitive hashable QuickCheck + quickcheck-instances scientific tagged tasty tasty-quickcheck text + time unordered-containers vector + ]; + homepage = "https://github.com/phadej/binary-orphans#readme"; + description = "Orphan instances for binary"; + license = stdenv.lib.licenses.bsd3; }) {}; "binary-parser_0_5_0_1" = callPackage @@ -44503,7 +44644,7 @@ self: { inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; inherit (pkgs) mesa;}; - "bindings-GLFW" = callPackage + "bindings-GLFW_3_1_2_0" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm , mesa, template-haskell, test-framework, test-framework-hunit @@ -44524,6 +44665,33 @@ self: { doCheck = false; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; + inherit (pkgs) mesa;}; + + "bindings-GLFW" = callPackage + ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor + , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm + , mesa, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "bindings-GLFW"; + version = "3.1.2.1"; + sha256 = "083cea7d2262aecd8a80f74d80c82c2aaa84cf80e960d456e8e34fc38398decb"; + libraryHaskellDepends = [ base bindings-DSL template-haskell ]; + librarySystemDepends = [ + libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr + libXxf86vm mesa + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + jailbreak = true; + description = "Low-level bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; @@ -47055,6 +47223,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blockhash" = callPackage + ({ mkDerivation, base, bytestring, JuicyPixels + , optparse-applicative, primitive, vector, vector-algorithms + }: + mkDerivation { + pname = "blockhash"; + version = "0.1.0.0"; + sha256 = "81e50f190a92639b5d6545d544500001c6567fbda18338a9238b1809bc4d5449"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring primitive vector vector-algorithms + ]; + executableHaskellDepends = [ + base JuicyPixels optparse-applicative vector + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/kseo/blockhash#readme"; + description = "Blockhash perceptual image hash algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blocking-transactions" = callPackage ({ mkDerivation, base, containers, parallel }: mkDerivation { @@ -47700,14 +47890,13 @@ self: { }: mkDerivation { pname = "boomange"; - version = "0.1.3.1"; - sha256 = "a0e249f91c62048a2cbf1d2935deab37ff214099634c15bb308a41fa72a3e1e9"; + version = "0.1.3.2"; + sha256 = "0a0d3eab319a67e76c0552a6d7bee457b7e102a2b10a9ba56b186dccfa008069"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers descrilo directory filepath simtreelo ]; - jailbreak = true; description = "A Bookmarks manager with a HTML generator"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -48455,7 +48644,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bson" = callPackage + "bson_0_3_2_2" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash , data-binary-ieee754, mtl, network, QuickCheck, test-framework , test-framework-quickcheck2, text, time @@ -48475,6 +48664,29 @@ self: { homepage = "http://github.com/mongodb-haskell/bson"; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bson" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash + , data-binary-ieee754, mtl, network, QuickCheck, test-framework + , test-framework-quickcheck2, text, time + }: + mkDerivation { + pname = "bson"; + version = "0.3.2.3"; + sha256 = "9b3aba435365cdfbbd0ba8ccb3400e961d56329da57f6de2e1e391004c374982"; + libraryHaskellDepends = [ + base binary bytestring cryptohash data-binary-ieee754 mtl network + text time + ]; + testHaskellDepends = [ + base binary bytestring cryptohash data-binary-ieee754 mtl network + QuickCheck test-framework test-framework-quickcheck2 text time + ]; + homepage = "http://github.com/mongodb-haskell/bson"; + description = "BSON documents are JSON-like objects with a standard binary encoding"; + license = "unknown"; }) {}; "bson-generic" = callPackage @@ -52719,18 +52931,17 @@ self: { }) {}; "canteven-log" = callPackage - ({ mkDerivation, aeson, base, bytestring, canteven-config - , directory, fast-logger, filepath, hslogger, monad-logger - , template-haskell, text, time, transformers, yaml + ({ mkDerivation, aeson, base, bytestring, directory, fast-logger + , filepath, monad-logger, template-haskell, text, time + , transformers, yaml }: mkDerivation { pname = "canteven-log"; - version = "0.3.0.3"; - sha256 = "2496d0cc6aad2108ad9982229e078144d8c8a7f427e86803a1e10a6b6bc6a36b"; + version = "1.0.0.0"; + sha256 = "67d58599b7ed949606208aab1c17d333d4793a911405e349c710db4267d2e098"; libraryHaskellDepends = [ - aeson base bytestring canteven-config directory fast-logger - filepath hslogger monad-logger template-haskell text time - transformers yaml + aeson base bytestring directory fast-logger filepath monad-logger + template-haskell text time transformers yaml ]; jailbreak = true; homepage = "https://github.com/SumAll/haskell-canteven-log"; @@ -55247,7 +55458,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "checkers" = callPackage + "checkers_0_4_4" = callPackage ({ mkDerivation, array, base, QuickCheck, random }: mkDerivation { pname = "checkers"; @@ -55256,6 +55467,18 @@ self: { libraryHaskellDepends = [ array base QuickCheck random ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "checkers" = callPackage + ({ mkDerivation, array, base, QuickCheck, random }: + mkDerivation { + pname = "checkers"; + version = "0.4.5"; + sha256 = "7963cf60f9fda15ea022351f75f8e5e8636f79b163ee4ad05e893f74e5112d91"; + libraryHaskellDepends = [ array base QuickCheck random ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; }) {}; "chell_0_4" = callPackage @@ -56556,7 +56779,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc" = callPackage + "clash-ghc_0_6_19" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra @@ -56583,6 +56806,34 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-ghc" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra + , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl + , process, text, time, transformers, unbound-generics, unix + , unordered-containers + }: + mkDerivation { + pname = "clash-ghc"; + version = "0.6.20"; + sha256 = "9cd2247062148e39cb1eb9f35a1fca9a1a8ad06d0d273eb7aa4a971673c68929"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-verilog clash-vhdl containers deepseq + directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise + hashable haskeline lens mtl process text time transformers + unbound-generics unix unordered-containers + ]; + jailbreak = true; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; @@ -56843,7 +57094,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib" = callPackage + "clash-lib_0_6_17" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, hashable, lens, mtl, pretty, process, template-haskell @@ -56863,6 +57114,29 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-lib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, ghc, hashable, lens, mtl, pretty, process + , template-haskell, text, time, transformers, unbound-generics + , unordered-containers, uu-parsinglib, wl-pprint-text + }: + mkDerivation { + pname = "clash-lib"; + version = "0.6.18"; + sha256 = "84031ce63203a0e339ec64de2f8804a8721a04b8be7f14e56faa8671bbcbb9fc"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clash-prelude concurrent-supply + containers deepseq directory errors fgl filepath ghc hashable lens + mtl pretty process template-haskell text time transformers + unbound-generics unordered-containers uu-parsinglib wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude_0_9_2" = callPackage @@ -56996,7 +57270,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-prelude" = callPackage + "clash-prelude_0_10_9" = callPackage ({ mkDerivation, array, base, data-default, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens , QuickCheck, reflection, singletons, template-haskell @@ -57013,6 +57287,27 @@ self: { singletons template-haskell ]; testHaskellDepends = [ base doctest ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-prelude" = callPackage + ({ mkDerivation, array, base, data-default, doctest, ghc-prim + , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens + , QuickCheck, reflection, singletons, template-haskell + }: + mkDerivation { + pname = "clash-prelude"; + version = "0.10.10"; + sha256 = "64577debc8c970919268374eb0b422a4b8152422df3683ce3b665cc1cfa94d9c"; + libraryHaskellDepends = [ + array base data-default ghc-prim ghc-typelits-extra + ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection + singletons template-haskell + ]; + testHaskellDepends = [ base doctest ]; doCheck = false; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; @@ -57158,7 +57453,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-systemverilog" = callPackage + "clash-systemverilog_0_6_6" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -57175,6 +57470,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-systemverilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.6.7"; + sha256 = "377e57de5f09852b6c2059fc8d114d01b48005f270265092e98251d3c9c4d92b"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-verilog_0_5_7" = callPackage @@ -57303,7 +57616,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-verilog" = callPackage + "clash-verilog_0_6_6" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -57320,6 +57633,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-verilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-verilog"; + version = "0.6.7"; + sha256 = "1794d45c04ce52c6488f970a465861785948e2ffa2ca275678efdb75902945ab"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Verilog backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-vhdl_0_5_8" = callPackage @@ -57520,7 +57851,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-vhdl" = callPackage + "clash-vhdl_0_6_13" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -57535,6 +57866,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-vhdl" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.6.14"; + sha256 = "1a1e42191123299d9c8e0aaed7f95f81cd3059bff91321e028e9c9641dc2b0e0"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "classify" = callPackage @@ -59738,7 +60087,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cmark" = callPackage + "cmark_0_5_2_1" = callPackage ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; @@ -59749,6 +60098,20 @@ self: { homepage = "https://github.com/jgm/commonmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cmark" = callPackage + ({ mkDerivation, base, bytestring, HUnit, text }: + mkDerivation { + pname = "cmark"; + version = "0.5.3.1"; + sha256 = "4ae12da7e712d10a662a8323e7bc513daa1abf3ad4d055054b5f19b1122ca124"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + homepage = "https://github.com/jgm/commonmark-hs"; + description = "Fast, accurate CommonMark (Markdown) parser and renderer"; + license = stdenv.lib.licenses.bsd3; }) {}; "cmath" = callPackage @@ -64094,6 +64457,8 @@ self: { pname = "consumers"; version = "2.0"; sha256 = "467af01ed4ce5f5240c16a0693e32f27f1f098723d11c7f1eab004d08f285995"; + revision = "1"; + editedCabalFile = "5f7410822e5c36feeb12b24e3bbcb02bb6ed295812ef013913e2afa81f1980c8"; libraryHaskellDepends = [ base containers exceptions hpqtypes lifted-base lifted-threads log monad-control mtl stm time transformers-base @@ -70425,12 +70790,11 @@ self: { }: mkDerivation { pname = "data-lens"; - version = "2.10.7"; - sha256 = "3b198a84158d757d074b6cf71fe16c8ad900e24991d9813d0b6361a1fd97e050"; + version = "2.11.0.1"; + sha256 = "690a282338dbd94ecf05fce07ea90724f1bd3349defd2f6619fcf635fb7b881b"; libraryHaskellDepends = [ base comonad containers semigroupoids transformers ]; - jailbreak = true; homepage = "http://github.com/roconnor/data-lens/"; description = "Used to be Haskell 98 Lenses"; license = stdenv.lib.licenses.bsd3; @@ -70441,12 +70805,11 @@ self: { ({ mkDerivation, base, comonad, data-lens, mtl, transformers }: mkDerivation { pname = "data-lens-fd"; - version = "2.0.5"; - sha256 = "d3df1cedb0ccacfa6a2926466e10388b2a2e7bd78f5718cb2260746eec730c65"; + version = "2.0.6"; + sha256 = "e95a54e60369b8dfe4fd378df178c759aec9ecb050f6eb35c5dfb0ad0e72dd81"; libraryHaskellDepends = [ base comonad data-lens mtl transformers ]; - jailbreak = true; homepage = "http://github.com/roconnor/data-lens-fd/"; description = "Lenses"; license = stdenv.lib.licenses.bsd3; @@ -70497,10 +70860,9 @@ self: { ({ mkDerivation, base, data-lens, template-haskell }: mkDerivation { pname = "data-lens-template"; - version = "2.1.9"; - sha256 = "cf94f5d81569ad8f0ce4194649f5920226adf990d4012728958516d9821af236"; + version = "2.2"; + sha256 = "f50b0f5364c5d8a11278722ccb2faf2b7c4451001b34b4f55150599484182af0"; libraryHaskellDepends = [ base data-lens template-haskell ]; - jailbreak = true; homepage = "http://github.com/roconnor/data-lens-template/"; description = "Utilities for Data.Lens"; license = stdenv.lib.licenses.bsd3; @@ -73457,8 +73819,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.3"; - sha256 = "14d1921e1046ca9802dc1cc62e1343d6d8ea6ea9056b8245b57cfaf85ee408ea"; + version = "0.3.1"; + sha256 = "d47aac3fb7f035e50325b539e873c242021a59bce0a124380f42bf11241438aa"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell transformers transformers-compat @@ -73500,10 +73862,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "descrilo"; - version = "0.1.0.3"; - sha256 = "82479f64aa13a8df7fafcf091ea34ca7044fad2e582489772fb1b46c3645a7a7"; + version = "0.1.0.4"; + sha256 = "17a392388b1e6f7206d720aca846c2da1a50a6cd1a0f5a97bba3d7be6c412142"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Loads a list of items with fields"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -76745,8 +77106,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.2.7"; - sha256 = "527f2b342e14a09af8d1b327942aab5b104316f8d8793a21f3468620bf099641"; + version = "0.2.8"; + sha256 = "d0dd0056edc862542d8ae07cf5e8ffd48b62e3f9d08ca035dfc737885d6684dd"; libraryHaskellDepends = [ base lens parsec parsers semigroups template-haskell ]; @@ -78894,12 +79255,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: + mkDerivation { + pname = "dlist"; + version = "0.8"; + sha256 = "1110fcbb197cb678452b74c7850c98b5be6c0a6bb97c33a606612d81963efd4f"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { pname = "dlist-instances"; version = "0.1"; sha256 = "2598aae775532829923d2a8f99dcaaa20e49efec31314e8460a761ee653b3264"; + revision = "1"; + editedCabalFile = "21ba4b861e244658892e61f3ca5ae4dc2aea78f46a3fcc2a8750784bf4ea6f2c"; libraryHaskellDepends = [ base dlist semigroups ]; homepage = "https://github.com/gregwebs/dlist-instances"; description = "Difference lists instances"; @@ -79005,6 +79382,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_4" = callPackage + ({ mkDerivation, attoparsec, base, binary, blaze-builder + , bytestring, conduit, conduit-extra, containers, doctest, hspec + , iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.4"; + sha256 = "2b4fc61f4ccb440aa2b8403bff1ba00a87782e46b4261d34e6c1a5a1f1c71d6d"; + libraryHaskellDepends = [ + attoparsec base binary blaze-builder bytestring conduit + conduit-extra containers iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary blaze-builder bytestring conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -83506,10 +83907,11 @@ self: { pname = "endo"; version = "0.3.0.1"; sha256 = "34048da71000312081715a95e35108e5526647232c857b3c8e13dbb69e364f6a"; + revision = "1"; + editedCabalFile = "7299a456be44c72431f9193f56bb9fb21e3f76746bd7affa433f2f0bede89eb7"; libraryHaskellDepends = [ base between data-default-class mtl transformers ]; - jailbreak = true; homepage = "https://github.com/trskop/endo"; description = "Endomorphism utilities"; license = stdenv.lib.licenses.bsd3; @@ -83925,6 +84327,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "env-locale" = callPackage + ({ mkDerivation, base, old-locale, time }: + mkDerivation { + pname = "env-locale"; + version = "1.0.0.1"; + sha256 = "f2f1feb9e3141984bda8e779c1a501fd9746994a4e12a2ad4eb47042c247fcf1"; + libraryHaskellDepends = [ base old-locale time ]; + homepage = "https://github.com/Ongy/locale-hs"; + description = "A (non-forking) interface to the current locale"; + license = "LGPL"; + }) {}; + "env-parser" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bytestring, containers, http-types, mtl @@ -85954,6 +86368,8 @@ self: { pname = "exceptions"; version = "0.8.2.1"; sha256 = "c435877ff2f04a1855e50c78bbcbf8c89f3dc42837e440956500599f6d851035"; + revision = "1"; + editedCabalFile = "0a3f64eb292941f2b9141a178b5d8ed5a9de82d2ed35b341b05c3e8e1b38c313"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -86899,6 +87315,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_4_12" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.4.12"; + sha256 = "205d0dbdf2d18325298170cd9d681995c267ae6fe029b5b934a8ea646aa393b2"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base clock directory filepath QuickCheck time unix + ]; + jailbreak = true; + homepage = "https://github.com/ndmitchell/extra#readme"; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies_0_2_0_0" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -89419,7 +89856,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fgl" = callPackage + "fgl_5_5_2_3" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , QuickCheck, transformers }: @@ -89433,14 +89870,44 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fgl" = callPackage + ({ mkDerivation, array, base, containers, deepseq, hspec + , QuickCheck, transformers + }: + mkDerivation { + pname = "fgl"; + version = "5.5.3.0"; + sha256 = "d70cd8e2694311fae0b44fe0d1b342c95706ceffd3be66767e9027dfa5597e39"; + libraryHaskellDepends = [ + array base containers deepseq transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "Martin Erwig's Functional Graph Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "fgl-arbitrary_0_2_0_1" = callPackage + ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: + mkDerivation { + pname = "fgl-arbitrary"; + version = "0.2.0.1"; + sha256 = "3e85922a7dde02ee0dac8f93eb233ccb16dfdd1a5a4ec8397fa1d9f7404a6104"; + libraryHaskellDepends = [ base fgl QuickCheck ]; + testHaskellDepends = [ base containers fgl hspec QuickCheck ]; + description = "QuickCheck support for fgl"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { pname = "fgl-arbitrary"; - version = "0.2.0.1"; - sha256 = "3e85922a7dde02ee0dac8f93eb233ccb16dfdd1a5a4ec8397fa1d9f7404a6104"; + version = "0.2.0.2"; + sha256 = "501d77f1f5efd952aaf06d35fc95bfd3a9bc93906f78a363766ec74d14d50b8b"; libraryHaskellDepends = [ base fgl QuickCheck ]; testHaskellDepends = [ base containers fgl hspec QuickCheck ]; description = "QuickCheck support for fgl"; @@ -90398,8 +90865,8 @@ self: { ({ mkDerivation, base, cmdargs, leancheck, template-haskell }: mkDerivation { pname = "fitspec"; - version = "0.2.2"; - sha256 = "1ac0034895c4ef1797b641a439d300910d3920cf7f02c00bbab3dae16a965e3d"; + version = "0.3.0"; + sha256 = "5c8897924c870e577d7e28344376bac99165d11abb8ef3be037a20e357c69564"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -95995,12 +96462,13 @@ self: { }) {}; "genvalidity" = callPackage - ({ mkDerivation, base, QuickCheck, validity }: + ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.1.0.0"; - sha256 = "43477a35f12da4d8806b2a152bebb5da563c2cb442b720090597d604fe40c4f6"; + version = "0.2.0.0"; + sha256 = "45312a8ba7603f99f16799f0c20e4bd613104e0a4340566ec3c9cf2ca7d315fe"; libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; @@ -96012,8 +96480,8 @@ self: { }: mkDerivation { pname = "genvalidity-containers"; - version = "0.1.0.0"; - sha256 = "2c44a1b1d0c7a0f9e6107da9fdc31f069d4211cc5cbd88e644edac38a2c6d164"; + version = "0.1.0.1"; + sha256 = "1193630423059f558d99e20f14e60daabb664539e25ca7c92ebca3f776dd94c2"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity ]; @@ -96026,8 +96494,8 @@ self: { ({ mkDerivation, base, genvalidity, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.1.0.1"; - sha256 = "41f102071074cf13cc1635fc80fec7f562900191549b4f68dec24797ef7e6625"; + version = "0.2.0.0"; + sha256 = "58f2b372c3997ae2bd31da8cf5f23cb7a1bc21d3824a93a144151cd0928243a3"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -96036,6 +96504,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-text" = callPackage + ({ mkDerivation, base, genvalidity, hspec, QuickCheck, text + , validity + }: + mkDerivation { + pname = "genvalidity-text"; + version = "0.1.0.0"; + sha256 = "faca82b1d58fb2cd40575f0743c2579def715e697eebbaba7fc75c6b73b28c4e"; + libraryHaskellDepends = [ + base genvalidity QuickCheck text validity + ]; + testHaskellDepends = [ base genvalidity hspec QuickCheck text ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Text"; + license = stdenv.lib.licenses.mit; + }) {}; + "geo-resolver" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, http-conduit, http-types, HUnit, QuickCheck @@ -97390,7 +97875,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-typelits-natnormalise" = callPackage + "ghc-typelits-natnormalise_0_4_2" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit }: mkDerivation { @@ -97402,6 +97887,21 @@ self: { homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-typelits-natnormalise" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.4.3"; + sha256 = "7dc2b7d308b49780ee7eda9a2a88b7d0df9cf88a9fc3a2c0391a28322c136b67"; + libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; }) {}; "ghc-vis" = callPackage @@ -97982,7 +98482,7 @@ self: { }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage - ({ mkDerivation, base, bytestring, cairo-gobject, containers + ({ mkDerivation, base, bytestring, cairo, containers , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers }: @@ -97994,17 +98494,21 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ cairo-gobject gobjectIntrospection ]; + libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; doHaddock = false; preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {cairo-gobject = null; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; "gi-cairo_1_0_6" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo-gobject, containers + ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers }: @@ -98016,14 +98520,18 @@ self: { libraryHaskellDepends = [ base bytestring containers haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ cairo-gobject gobjectIntrospection ]; + libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; doHaddock = false; preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {cairo-gobject = null; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, containers, gdk3, gi-cairo @@ -99794,8 +100302,8 @@ self: { }: mkDerivation { pname = "gitHUD"; - version = "1.3.1"; - sha256 = "d770a57be1e746ed39e1c34ae6464ac4fd66599503a8b4e92f1b8a69cf986ccb"; + version = "1.3.2"; + sha256 = "1ae533abaa42c6fdca5eef94cc0e94ae6712cf1fc1336486912dedb863c4fb06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process unix ]; @@ -104456,6 +104964,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphviz_2999_18_1_2" = callPackage + ({ mkDerivation, base, bytestring, colour, containers, directory + , dlist, fgl, fgl-arbitrary, filepath, polyparse, process + , QuickCheck, temporary, text, transformers, wl-pprint-text + }: + mkDerivation { + pname = "graphviz"; + version = "2999.18.1.2"; + sha256 = "b08c2026d3810c15f6ad49a07fd7b879978d958fa477b369b719ec00741c85fc"; + libraryHaskellDepends = [ + base bytestring colour containers directory dlist fgl filepath + polyparse process temporary text transformers wl-pprint-text + ]; + testHaskellDepends = [ + base containers fgl fgl-arbitrary filepath QuickCheck text + ]; + homepage = "http://projects.haskell.org/graphviz/"; + description = "Bindings to Graphviz for graph visualisation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "grasp" = callPackage ({ mkDerivation, base, clock, directory, extra, filepath, hashable , lens, megaparsec, MonadRandom, mtl, pcre-heavy, primitive @@ -112711,8 +113241,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.18"; - sha256 = "ebf2f2a9845ca90a50bdf1c0943d47fa55bade1d622d5f5e75ba98cd097ff94c"; + version = "0.18.1"; + sha256 = "ab6c31a6dca1bd0f7cbf4e51225dd18ef25185f70c2f33fd207968b44157b028"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; @@ -112958,8 +113488,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.6.0"; - sha256 = "8d45dabf15d4073a94f5d634538288dbac6ace1971b673cafc76ea92671bb26a"; + version = "0.7.0"; + sha256 = "c0582b2a51526e24483d71f1669bba2ef340ae7014babb3a9a5b59296fc5faf2"; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath haskell-src-exts mtl transformers traverse-with-class uniplate @@ -112968,7 +113498,6 @@ self: { base containers filemanip filepath haskell-src-exts mtl pretty-show tasty tasty-golden traverse-with-class ]; - jailbreak = true; homepage = "http://documentup.com/haskell-suite/haskell-names"; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -115422,7 +115951,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hasql" = callPackage + "hasql_0_19_12" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras , data-default-class, dlist, either, hashable, hashtables, loch-th @@ -115450,6 +115979,36 @@ self: { homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hasql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , data-default-class, dlist, either, hashable, hashtables, loch-th + , mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, scientific + , semigroups, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.13"; + sha256 = "f58a3b5b7cd8c674a1b0735b6d3e43ca5d932e66124446eed2270a749ab2b114"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring + bytestring-tree-builder contravariant contravariant-extras + data-default-class dlist either hashable hashtables loch-th mtl + placeholders postgresql-binary postgresql-libpq profunctors + scientific semigroups text time transformers uuid vector + ]; + testHaskellDepends = [ + data-default-class QuickCheck quickcheck-instances rebase tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "A very efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; }) {}; "hasql-backend_0_2_1" = callPackage @@ -119438,7 +119997,10 @@ self: { pname = "hflags"; version = "0.4"; sha256 = "a441ba0890c8c4cede8ff0c4179ae2878e4f294347db5abfe2dcd6398ee8ff9f"; + revision = "1"; + editedCabalFile = "92f936373a94c1e434e2478b624dd38ab4c66539dfc7d47afa6bf3279cf36c58"; libraryHaskellDepends = [ base containers template-haskell text ]; + jailbreak = true; homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; license = "unknown"; @@ -119451,7 +120013,10 @@ self: { pname = "hflags"; version = "0.4.1"; sha256 = "147d65cba2959b682e4a33378a80766a1011a78ed767a4d08ae463af6d428a0c"; + revision = "1"; + editedCabalFile = "f310a53519ee630e1fce25c0169e788530636a0f6bd78c49b95cf4fc82b83344"; libraryHaskellDepends = [ base containers template-haskell text ]; + jailbreak = true; homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; license = stdenv.lib.licenses.asl20; @@ -119464,6 +120029,8 @@ self: { pname = "hflags"; version = "0.4.2"; sha256 = "2cd30d637f4011d9b614698ef7f7bf1f55c45900e6683d60c7b17af5750f2cc5"; + revision = "1"; + editedCabalFile = "4165343ab35bbf063b872c69a353f1bffb962ce75bd66d7c1478a8083c7a5acd"; libraryHaskellDepends = [ base containers template-haskell text ]; homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; @@ -119566,33 +120133,41 @@ self: { }) {}; "hfsevents_0_1_5" = callPackage - ({ mkDerivation }: + ({ mkDerivation, base, bytestring, cereal, Cocoa, CoreServices, mtl + , text + }: mkDerivation { pname = "hfsevents"; version = "0.1.5"; sha256 = "b348be81f278bcbf384a59029a0135c4aef6b687f2a7168a66aeea54a494e942"; - isLibrary = false; - isExecutable = false; + libraryHaskellDepends = [ base bytestring cereal mtl text ]; + librarySystemDepends = [ Cocoa ]; + libraryToolDepends = [ CoreServices ]; homepage = "http://github.com/luite/hfsevents"; description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" ]; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; "hfsevents" = callPackage - ({ mkDerivation }: + ({ mkDerivation, base, bytestring, cereal, Cocoa, CoreServices, mtl + , text + }: mkDerivation { pname = "hfsevents"; version = "0.1.6"; sha256 = "74c3f3f3a5e55fff320c352a2d481069ff915860a0ab970864c6a0e6b65d3f05"; - isLibrary = false; - isExecutable = false; + libraryHaskellDepends = [ base bytestring cereal mtl text ]; + librarySystemDepends = [ Cocoa ]; + libraryToolDepends = [ CoreServices ]; homepage = "http://github.com/luite/hfsevents"; description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" ]; - }) {}; + }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; "hfusion" = callPackage ({ mkDerivation, base, containers, haskell-src, mtl, pretty, syb }: @@ -119748,6 +120323,23 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "hgeos" = callPackage + ({ mkDerivation, base, doctest, geos_c, Glob }: + mkDerivation { + pname = "hgeos"; + version = "0.1.0.0"; + sha256 = "dbcec98beff9c4717cb47a79057429b3151f6253cd60d3adeb8b4005c4c5e15f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ geos_c ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/rcook/hgeos#readme"; + description = "Haskell bindings to GEOS C API"; + license = stdenv.lib.licenses.mit; + }) {geos_c = null;}; + "hgettext" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath , haskell-src-exts, process, setlocale, uniplate @@ -120669,7 +121261,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hindent" = callPackage + "hindent_4_6_3" = callPackage ({ mkDerivation, base, containers, data-default, descriptive , directory, ghc-prim, haskell-src-exts, hspec, monad-loops, mtl , text, transformers @@ -120695,6 +121287,32 @@ self: { homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hindent" = callPackage + ({ mkDerivation, base, containers, descriptive, directory, ghc-prim + , haskell-src-exts, hspec, monad-loops, mtl, text, transformers + }: + mkDerivation { + pname = "hindent"; + version = "4.6.4"; + sha256 = "26fc1498705b8a64b03eb5b699ba6229955273d91a49a01c3c2b58436c8e4dcf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers haskell-src-exts monad-loops mtl text transformers + ]; + executableHaskellDepends = [ + base descriptive directory ghc-prim haskell-src-exts text + ]; + testHaskellDepends = [ + base directory haskell-src-exts hspec monad-loops mtl text + ]; + doCheck = false; + homepage = "http://www.github.com/chrisdone/hindent"; + description = "Extensible Haskell pretty printer"; + license = stdenv.lib.licenses.bsd3; }) {}; "hindley-milner" = callPackage @@ -125621,6 +126239,7 @@ self: { homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Documentation"; license = stdenv.lib.licenses.agpl3; + maintainers = with stdenv.lib.maintainers; [ khumba ]; }) {}; "hoppy-generator" = callPackage @@ -125638,6 +126257,7 @@ self: { homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Code generator"; license = stdenv.lib.licenses.agpl3; + maintainers = with stdenv.lib.maintainers; [ khumba ]; }) {}; "hoppy-runtime" = callPackage @@ -125651,6 +126271,7 @@ self: { homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Runtime support"; license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ khumba ]; }) {}; "hoppy-std" = callPackage @@ -125666,6 +126287,7 @@ self: { homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Standard library bindings"; license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ khumba ]; }) {}; "hops" = callPackage @@ -126438,8 +127060,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.8.0.2"; - sha256 = "b7f3c775454faea34a3bef496741f5d15ff5fc8319981b61b799ec895a21dca5"; + version = "0.8.0.3"; + sha256 = "699fc04179a479e2b1560122166c6687cd7214d2fa7376c14210465625657974"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126540,8 +127162,10 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.5.0"; - sha256 = "24c9d41d67f3df33fcf00d6eb03e9a9d0a6be8decf1488383696d1b0a44bb5ba"; + version = "1.5.1"; + sha256 = "82fb016dac6830ab8229f2b5e501ea36299c370cddbb7102b8c2837a25028f12"; + revision = "1"; + editedCabalFile = "aa5935930b36b798869a4071e1d390ee1f84f754652a16708e21abbdb3ce0989"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class exceptions lifted-base monad-control mtl resource-pool text text-show time @@ -130783,6 +131407,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hspec-stack-rerun" = callPackage + ({ mkDerivation, base, directory, hspec, safe, strict }: + mkDerivation { + pname = "hspec-stack-rerun"; + version = "0.1.0.3"; + sha256 = "0f6714da2beb48b5882a17fb45e83d778ce5a6b12f60a83c75ae3391fee16deb"; + libraryHaskellDepends = [ base directory hspec safe strict ]; + homepage = "https://github.com/mwotton/hspec-stack-rerun#readme"; + description = "Simple project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-structured-formatter" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -135159,7 +135795,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "human-readable-duration" = callPackage + "human-readable-duration_0_2_0_1" = callPackage ({ mkDerivation, base, doctest, time }: mkDerivation { pname = "human-readable-duration"; @@ -135170,6 +135806,20 @@ self: { homepage = "http://github.com/yogsototh/human-readable-duration#readme"; description = "Provide duration helper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "human-readable-duration" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "human-readable-duration"; + version = "0.2.0.3"; + sha256 = "93f3a91a2994588728ae757dcca5104e18a570b3591773aa7f03c524c97599da"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "http://github.com/yogsototh/human-readable-duration#readme"; + description = "Provide duration helper"; + license = stdenv.lib.licenses.bsd3; }) {}; "hums" = callPackage @@ -135574,7 +136224,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hw-bits" = callPackage + "hw-bits_0_0_0_6" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap , parsec, QuickCheck, resourcet, vector }: @@ -135592,6 +136242,29 @@ self: { homepage = "http://github.com/haskell-works/hw-bits#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hw-bits" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap + , parsec, QuickCheck, resourcet, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.0.0.7"; + sha256 = "16e58787b6a39fb6602926480be7eb5486f2e652668e0fb70b0ec1467b755926"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; + executableHaskellDepends = [ + base criterion mmap resourcet vector + ]; + testHaskellDepends = [ + base bytestring hspec hw-prim QuickCheck vector + ]; + homepage = "http://github.com/haskell-works/hw-bits#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -135739,13 +136412,15 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.0.3.1"; - sha256 = "95ff89991fa2e1b0f4cb4a2d7a4bac15cf5a30224facd4b92292d8884600aff5"; + version = "0.0.3.2"; + sha256 = "c96ca6011d55419105bba7eebcae2d5afc627bdbcb4536469ba0b7a9f553c764"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring random vector ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck random vector + ]; homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; @@ -140224,6 +140899,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ini-qq" = callPackage + ({ mkDerivation, base, HUnit, ini, raw-strings-qq, template-haskell + , text + }: + mkDerivation { + pname = "ini-qq"; + version = "0.1.0.0"; + sha256 = "8c5e9da0f3307de0e3c291dc108fbbcac832fae7bb974f64961813dca4e8faeb"; + libraryHaskellDepends = [ base ini template-haskell text ]; + testHaskellDepends = [ base HUnit ini raw-strings-qq text ]; + homepage = "https://github.com/kseo/ini-qq#readme"; + description = "Quasiquoter for INI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "inilist" = callPackage ({ mkDerivation, base, bifunctors, containers, deepseq, HUnit, safe , tasty, tasty-hunit, testpack, trifecta @@ -141237,7 +141927,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "invariant" = callPackage + "invariant_0_3_1" = callPackage ({ mkDerivation, array, base, bifunctors, containers, contravariant , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar , stm, tagged, template-haskell, transformers, transformers-compat @@ -141256,6 +141946,28 @@ self: { homepage = "https://github.com/nfrisby/invariant-functors"; description = "Haskell 98 invariant functors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "invariant" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, profunctors, QuickCheck + , semigroups, StateVar, stm, tagged, template-haskell, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.4"; + sha256 = "dccf2790eb545d167623c0133aa0838d714004bfd158e3c9dfaca38497aef316"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors semigroups StateVar stm tagged template-haskell + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/nfrisby/invariant-functors"; + description = "Haskell 98 invariant functors"; + license = stdenv.lib.licenses.bsd3; }) {}; "invertible" = callPackage @@ -145034,15 +145746,17 @@ self: { }) {}; "json-rpc-generic" = callPackage - ({ mkDerivation, aeson, base, bytestring, QuickCheck - , quickcheck-simple, scientific, text, transformers, vector + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , QuickCheck, quickcheck-simple, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "json-rpc-generic"; - version = "0.0.1.0"; - sha256 = "248c91a30ec210afd5f96e0fd69a05188a1b015085313cebf6cad82ba57d2962"; + version = "0.1.0.0"; + sha256 = "20aee2bf91cd7e9b630282e34adb0b5ba6ae2f881aa5d3f4bd1b41536c49faa1"; libraryHaskellDepends = [ - aeson base bytestring scientific text transformers vector + aeson base bytestring containers dlist scientific text transformers + unordered-containers vector ]; testHaskellDepends = [ aeson base QuickCheck quickcheck-simple text @@ -146255,6 +146969,31 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "kawhi" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-client + , http-conduit, http-types, mtl, safe, scientific, smallcheck + , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text + }: + mkDerivation { + pname = "kawhi"; + version = "0.0.1"; + sha256 = "bb7bb30129c065032d217834d9f991df63ddfa55ee14e4c45ef5ddf141839d6f"; + revision = "1"; + editedCabalFile = "624bf276517215fb85d51f9252dce93acfde800feaa6439d054f6037bc2f3cb3"; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-client http-conduit + http-types mtl safe scientific text + ]; + testHaskellDepends = [ + aeson base bytestring exceptions http-client http-types mtl + scientific smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text + ]; + homepage = "https://github.com/hamsterdam/kawhi"; + description = "stats.NBA.com library"; + license = stdenv.lib.licenses.mit; + }) {}; + "kazura-queue" = callPackage ({ mkDerivation, async, atomic-primops, base, containers, deepseq , doctest, exceptions, free, hspec, hspec-expectations, HUnit, mtl @@ -150522,8 +151261,8 @@ self: { ({ mkDerivation, base, parsec, wl-pprint }: mkDerivation { pname = "language-webidl"; - version = "0.1.1.1"; - sha256 = "b2d096f8f44ee131e7bb06df246fa163b5da6a6eac0a3e385642fb14d5c19d18"; + version = "0.1.2.0"; + sha256 = "50be4849f64d6bfa799fafd77b89480e7342d4daf30684179dc88b8891cdce4c"; libraryHaskellDepends = [ base parsec wl-pprint ]; description = "Parser and Pretty Printer for WebIDL"; license = stdenv.lib.licenses.mit; @@ -151191,8 +151930,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.4.1"; - sha256 = "7fb4316f341ade6abb56afe9f4978be204f0f7da42c324e474953b7ac0380793"; + version = "0.5.0"; + sha256 = "191b704dd7bb74e6ee23aecad3a9f267867908f5594b809755273950d6d516b8"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/rudymatela/leancheck#readme"; @@ -152291,10 +153030,9 @@ self: { ({ mkDerivation, base, bindings-levmar, hmatrix, vector }: mkDerivation { pname = "levmar"; - version = "1.2.1.5"; - sha256 = "727ec5ebd523997b471685c7aed6f1a91120707e3b273734d23a6fc6a35d5525"; + version = "1.2.1.6"; + sha256 = "90e6560a6d3e94ea6e0517079b4f00559725c120047ea98bb7500624e6a2747e"; libraryHaskellDepends = [ base bindings-levmar hmatrix vector ]; - jailbreak = true; homepage = "https://github.com/basvandijk/levmar"; description = "An implementation of the Levenberg-Marquardt algorithm"; license = stdenv.lib.licenses.bsd3; @@ -153437,6 +154175,8 @@ self: { pname = "lifted-threads"; version = "1.0"; sha256 = "7f7dd54c54b252f3f3884a18282364a2b785ace96e8922b1d013fd62573800eb"; + revision = "1"; + editedCabalFile = "9ca26a82d283f9c00a7de537198cd0ce1a05e6e802e0e7f82663c45242a9e973"; libraryHaskellDepends = [ base monad-control threads transformers-base ]; @@ -155069,8 +155809,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.2"; - sha256 = "604e0c634672d91688f859da9345a2f60a680f77471df4528cb6931ca3b8ea9e"; + version = "0.6.3"; + sha256 = "f5462fb3989c2687b4678aa427d61b0c2aa1793307a9f6e61c19aaecb2e19c35"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -155783,8 +156523,8 @@ self: { pname = "lock-file"; version = "0.5.0.2"; sha256 = "274ecb94d0af66fed7b624fca402381d7f262f510ac7c4271037153efda49ad0"; - revision = "1"; - editedCabalFile = "ef22bf7dfd46708eebcc8a895a0a265e6bbf1d05a7ebfdf0f9ee6513d838df8e"; + revision = "3"; + editedCabalFile = "565e73c14184f1760473a10e35d2a04f354dbec33abcf185d217754ad63709b6"; libraryHaskellDepends = [ base data-default-class directory exceptions tagged-exception-core transformers @@ -155794,7 +156534,6 @@ self: { tagged-exception-core test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; - jailbreak = true; homepage = "https://github.com/trskop/lock-file"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; @@ -155852,8 +156591,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.5.0"; - sha256 = "d73310d807d3caecec03911c06d0e7a374956ed1030910c6c477bac6af3ccdf5"; + version = "0.5.2"; + sha256 = "a105254ee5121e87cea0fb168909a14edbc1506bc62fef51e3bbba2e7d60c2b3"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring cond deepseq exceptions hpqtypes http-client lifted-base @@ -156914,8 +157653,8 @@ self: { }: mkDerivation { pname = "ltext"; - version = "0.1.0"; - sha256 = "a9a9d43833a12c8ec19e4fdb3b1c94002fb3b91d2ee8bc6557abd4e6ea709fad"; + version = "0.1.2"; + sha256 = "24722147121bfe34e42e92badcf4b30a2f176608e7b72cf7c0a49d1e49498ebd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158579,8 +159318,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }: mkDerivation { pname = "makefile"; - version = "0.1.0.1"; - sha256 = "d78c1bf4e9ddd60f61a575887a742f20cdd9f1193a920b46ac9e5ad73d1089b5"; + version = "0.1.0.3"; + sha256 = "2ad77fc1cc390225ecb7155f6df87b3be5bdba5803629ba687f98711a8114e4a"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ attoparsec base bytestring doctest Glob ]; doCheck = false; @@ -158589,20 +159328,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "makefile_0_1_0_3" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }: - mkDerivation { - pname = "makefile"; - version = "0.1.0.3"; - sha256 = "2ad77fc1cc390225ecb7155f6df87b3be5bdba5803629ba687f98711a8114e4a"; - libraryHaskellDepends = [ attoparsec base bytestring ]; - testHaskellDepends = [ attoparsec base bytestring doctest Glob ]; - homepage = "http://github.com/nmattia/mask"; - description = "Simple Makefile parser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "managed_1_0_0" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -162292,7 +163017,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-mtl" = callPackage + "microlens-mtl_0_1_8_0" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -162306,9 +163031,10 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "microlens support for Reader/Writer/State from mtl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-mtl_0_1_9_0" = callPackage + "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -162322,7 +163048,6 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "microlens support for Reader/Writer/State from mtl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-platform_0_1_7_0" = callPackage @@ -162439,7 +163164,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-platform" = callPackage + "microlens-platform_0_3_2_0" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: @@ -162451,12 +163176,14 @@ self: { base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector ]; + jailbreak = true; homepage = "http://github.com/aelve/microlens"; description = "Feature-complete microlens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-platform_0_3_3_0" = callPackage + "microlens-platform" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: @@ -162468,11 +163195,9 @@ self: { base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/aelve/microlens"; description = "Feature-complete microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-th_0_2_1_0" = callPackage @@ -163495,6 +164220,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "mios" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc-prim, primitive + , vector + }: + mkDerivation { + pname = "mios"; + version = "1.2.1"; + sha256 = "a64ee6a6ccaa12204eec897cc2bef9122ffe92ec924920d6814f95f5a31e6280"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers ghc-prim primitive vector + ]; + executableHaskellDepends = [ + base bytestring containers ghc-prim primitive vector + ]; + homepage = "https://github.com/shnarazk/mios"; + description = "A Minisat-based SAT solver in Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mirror-tweet" = callPackage ({ mkDerivation, authenticate-oauth, base, bytestring, conduit , lens, monad-logger, text, transformers, twitter-conduit @@ -165022,27 +165768,43 @@ self: { }: mkDerivation { pname = "monad-logger-prefix"; - version = "0.1.2"; - sha256 = "e9fdf038d50ddf6ae448591f758447359ea3f4f35f5f7e3d092c3f87ed686166"; + version = "0.1.4"; + sha256 = "3723db1545702f800a3fa5663f4120b9778ce089c50bddf4c0263ff8ca46d39a"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl resourcet text transformers transformers-base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme"; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; }) {}; + "monad-logger-syslog_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, fast-logger, hsyslog + , monad-logger, text, transformers + }: + mkDerivation { + pname = "monad-logger-syslog"; + version = "0.1.1.1"; + sha256 = "6e1bc3833c3768c354ea269b95a8c566036ba606b769dacda1b9653b4b22b541"; + libraryHaskellDepends = [ + base bytestring fast-logger hsyslog monad-logger text transformers + ]; + homepage = "https://github.com/fpco/monad-logger-syslog"; + description = "syslog output for monad-logger"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.1.1"; - sha256 = "6e1bc3833c3768c354ea269b95a8c566036ba606b769dacda1b9653b4b22b541"; + version = "0.1.2.0"; + sha256 = "8b7d6598cbe4046aaeb7f86e526f259be4dde43967bf8a15f8ce3ea9f33221c2"; libraryHaskellDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; @@ -165617,6 +166379,8 @@ self: { pname = "monad-time"; version = "0.2"; sha256 = "a9b901ca94b4c71d5f374a472506db92d26b13af523ceafe1e3302e8bae8b05d"; + revision = "1"; + editedCabalFile = "a3a67f4b7fd08b82054dcf1d0cda06afcafa60644ea837ac8135a1c2cbe1a9ec"; libraryHaskellDepends = [ base mtl time ]; testHaskellDepends = [ base mtl time ]; homepage = "https://github.com/scrive/monad-time"; @@ -166282,8 +167046,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.1.0.1"; - sha256 = "db9909feb0ba4fc2c6a554b1f97f546dc27acc57dcfc6a46854a17cace08686f"; + version = "2.1.0.2"; + sha256 = "476489da2b14e55c7c3a17bce0e3eb6283eb72a0f4dfa823ba7708a13924ce2c"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring containers cryptohash data-default-class hashtables @@ -166742,7 +167506,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monoid-extras" = callPackage + "monoid-extras_0_4_1_2" = callPackage ({ mkDerivation, base, groups, semigroupoids, semigroups }: mkDerivation { pname = "monoid-extras"; @@ -166751,6 +167515,18 @@ self: { libraryHaskellDepends = [ base groups semigroupoids semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "monoid-extras" = callPackage + ({ mkDerivation, base, groups, semigroupoids, semigroups }: + mkDerivation { + pname = "monoid-extras"; + version = "0.4.2"; + sha256 = "13ff4e055c9656a3e599567cbc4a46ef8617c05534de46909a4239696e34281f"; + libraryHaskellDepends = [ base groups semigroupoids semigroups ]; + description = "Various extra monoid-related definitions and utilities"; + license = stdenv.lib.licenses.bsd3; }) {}; "monoid-owns" = callPackage @@ -169774,6 +170550,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "namespace" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "namespace"; + version = "0.1.0.0"; + sha256 = "5bb87af21ac3ac6fe6fee9ecf657b7c10a60b3b308e7ab7a933e80a52a743213"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/xu-hao/namespace"; + description = "A Generic Haskell library for managing namespaces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nano-cryptr" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -169934,19 +170723,15 @@ self: { "nanovg" = callPackage ({ mkDerivation, base, bytestring, containers, freeglut, GLEW - , hspec, inline-c, linear, mesa, QuickCheck, text, vector + , hspec, inline-c, mesa, QuickCheck, text, vector }: mkDerivation { pname = "nanovg"; - version = "0.3.0.0"; - sha256 = "66225623b3841f35f68c177ab01c81c2ba47b1713b384df7c6f04124dca018b3"; - libraryHaskellDepends = [ - base bytestring containers linear text vector - ]; + version = "0.4.0.0"; + sha256 = "910addcdcf0691facf8a599fb800f0bdaf93cd06ba3bf76bdf3e6d0080833e91"; + libraryHaskellDepends = [ base bytestring containers text vector ]; librarySystemDepends = [ freeglut GLEW mesa ]; - testHaskellDepends = [ - base containers hspec inline-c linear QuickCheck - ]; + testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; homepage = "https://github.com/cocreature/nanovg-hs"; description = "Haskell bindings for nanovg"; license = stdenv.lib.licenses.isc; @@ -170481,7 +171266,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "neat-interpolation" = callPackage + "neat-interpolation_0_3_2" = callPackage ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell , text }: @@ -170496,6 +171281,24 @@ self: { homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "neat-interpolation" = callPackage + ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell + , text + }: + mkDerivation { + pname = "neat-interpolation"; + version = "0.3.2.1"; + sha256 = "5530e43ca4de09b972d173e522f9dc96265f3afe0df695a25f0141be816fa014"; + libraryHaskellDepends = [ + base base-prelude parsec template-haskell text + ]; + testHaskellDepends = [ base-prelude HTF ]; + homepage = "https://github.com/nikita-volkov/neat-interpolation"; + description = "A quasiquoter for neat and simple multiline text interpolation"; + license = stdenv.lib.licenses.mit; }) {}; "needle" = callPackage @@ -174409,8 +175212,8 @@ self: { }: mkDerivation { pname = "octane"; - version = "0.13.2"; - sha256 = "661df67cee1c5719207e2c92aebde1d7da52333dd5b0227f87e2619a234d5729"; + version = "0.13.3"; + sha256 = "c3755604afc8b1757bdc94383d04d757ae6cd525f41b55ba9a210e1d74f6a9fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177006,6 +177809,8 @@ self: { pname = "overloaded-records"; version = "0.4.1.0"; sha256 = "f97b08e420bfc9d435a77ec391fec1da305000faaaf0c01ad84217de003b5a76"; + revision = "1"; + editedCabalFile = "0aa55c702c1bbd15c4ddeb7efd21c2024e628ea266ae601673c2cf9bb5e25f24"; libraryHaskellDepends = [ base data-default-class template-haskell ]; @@ -178131,6 +178936,54 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_1_17_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , cmark, containers, data-default, deepseq, Diff, directory + , executable-path, extensible-exceptions, filemanip, filepath + , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP + , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl + , network, network-uri, old-time, pandoc-types, parsec, process + , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , texmath, text, time, unordered-containers, vector, xml, yaml + , zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "1.17.2"; + sha256 = "81727d054dfb26de816ea59ed541ebaf60d66d440012c12ec02f9c2b02fee8ec"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring binary blaze-html blaze-markup + bytestring cmark containers data-default deepseq directory + extensible-exceptions filemanip filepath ghc-prim haddock-library + highlighting-kate hslua HTTP http-client http-client-tls http-types + JuicyPixels mtl network network-uri old-time pandoc-types parsec + process random scientific SHA syb tagsoup temporary texmath text + time unordered-containers vector xml yaml zip-archive zlib + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory extensible-exceptions + filepath highlighting-kate HTTP network network-uri pandoc-types + text yaml + ]; + testHaskellDepends = [ + ansi-terminal base bytestring containers Diff directory + executable-path filepath highlighting-kate HUnit pandoc-types + process QuickCheck syb test-framework test-framework-hunit + test-framework-quickcheck2 text zip-archive + ]; + doCheck = false; + homepage = "http://pandoc.org"; + description = "Conversion between markup formats"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc_0_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl @@ -178432,6 +179285,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pandoc-citeproc_0_10_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hs-bibutils, mtl + , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.10.1"; + sha256 = "ebc3eb3ff95e97ebd46c0918a65db2da021de2a70d02dc85ca5b344ea5c21205"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath pandoc + pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath pandoc pandoc-types + process temporary text yaml + ]; + jailbreak = true; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -178457,8 +179345,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.1.3"; - sha256 = "d14b78972c48a722b7e53d12fb601e4379d5384f9a58c8ce46ab42b058125471"; + version = "0.2.2.1"; + sha256 = "85da5dff663b578367ed75dcd71d8273a9cd92e8ae4a907ff0b83694d8417abd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178475,7 +179363,6 @@ self: { data-accessor-transformers data-default hspec mtl pandoc pandoc-types process roman-numerals syb template-haskell yaml ]; - jailbreak = true; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -180095,7 +180982,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "path-io" = callPackage + "path-io_1_1_0" = callPackage ({ mkDerivation, base, directory, exceptions, filepath, hspec, path , temporary, time, transformers }: @@ -180110,6 +180997,25 @@ self: { homepage = "https://github.com/mrkkrp/path-io"; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "path-io" = callPackage + ({ mkDerivation, base, containers, directory, exceptions, filepath + , hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.2.0"; + sha256 = "cb8bfb9fca81eb0f0f9b81761cc5a6edc61204e2c630f7277173147cf149336f"; + libraryHaskellDepends = [ + base containers directory exceptions filepath path temporary time + transformers unix-compat + ]; + testHaskellDepends = [ base exceptions hspec path unix-compat ]; + homepage = "https://github.com/mrkkrp/path-io"; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = stdenv.lib.licenses.bsd3; }) {}; "path-pieces_0_1_4" = callPackage @@ -181250,6 +182156,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "periodic" = callPackage + ({ mkDerivation, base, cereal, hedis, hspec, text, time }: + mkDerivation { + pname = "periodic"; + version = "0.1.0.0"; + sha256 = "1973c062977b6babdfca47f172356657296142c711a834d1123c9414df1bab84"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base cereal hedis text time ]; + executableHaskellDepends = [ base cereal hedis text time ]; + testHaskellDepends = [ base cereal hedis hspec text time ]; + homepage = "https://github.com/positiondev/periodic"; + description = "A reliable at-least-once periodic job scheduler backed by redis"; + license = stdenv.lib.licenses.isc; + }) {}; + "perm" = callPackage ({ mkDerivation, base, catch-fd, HUnit, mtl, test-framework , test-framework-hunit, transformers @@ -183407,8 +184329,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.5.1.3"; - sha256 = "c0070245e0b569ceef15e55be816a069cf2d26774c9613368d915e6ecb396f2a"; + version = "2.5.1.4"; + sha256 = "bd2fb5aadbee3770c562a472e87dd812f30fea05334e6e19b223f322ebced072"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -185104,7 +186026,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "pipes-cliff" = callPackage + "pipes-cliff_0_10_0_4" = callPackage ({ mkDerivation, async, base, bytestring, pipes, pipes-safe , process, stm }: @@ -185118,6 +186040,23 @@ self: { homepage = "http://www.github.com/massysett/pipes-cliff"; description = "Streaming to and from subprocesses using Pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipes-cliff" = callPackage + ({ mkDerivation, async, base, bytestring, pipes, pipes-safe + , process, stm, unix + }: + mkDerivation { + pname = "pipes-cliff"; + version = "0.12.0.0"; + sha256 = "4fc4ce908899d20ed1ea8964cfe38bc547476d6901934cbb82e35e4ada5417c5"; + libraryHaskellDepends = [ + async base bytestring pipes pipes-safe process stm unix + ]; + homepage = "http://www.github.com/massysett/pipes-cliff"; + description = "Streaming to and from subprocesses using Pipes"; + license = stdenv.lib.licenses.bsd3; }) {}; "pipes-concurrency_2_0_2" = callPackage @@ -186216,8 +187155,8 @@ self: { }: mkDerivation { pname = "pixelated-avatar-generator"; - version = "0.1.0"; - sha256 = "f4fe2536605c0f1df69fd15da6007c95a28fff1b8c40d2368a120d906f85e2ef"; + version = "0.1.1"; + sha256 = "0900c62aa1ffc80ef2293f52fd20d25da75cb801e059c5afff6e8b60d2ae841f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192227,8 +193166,8 @@ self: { ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20160708"; - sha256 = "6a2a246694723c81312a3963c5750b0ddd60b863b200849a9d2f9d2fe1e85a5f"; + version = "0.20160716"; + sha256 = "19d7fd9990954284073323d9d22a892f1b600761e5353e9a0473d46591956956"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -193639,6 +194578,7 @@ self: { homepage = "http://khumba.net/projects/qtah"; description = "Qt bindings for Haskell - C++ library"; license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ khumba ]; }) {}; "qtah-examples" = callPackage @@ -193657,6 +194597,7 @@ self: { homepage = "http://khumba.net/projects/qtah"; description = "Example programs for Qtah Qt bindings"; license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ khumba ]; }) {}; "qtah-generator" = callPackage @@ -193665,8 +194606,8 @@ self: { }: mkDerivation { pname = "qtah-generator"; - version = "0.1.0"; - sha256 = "446d1d14e629f5b18bd4d28d3e6d1866d73147ce499a47d84f1bf91f4490126a"; + version = "0.1.1"; + sha256 = "10cf7128d9cd923fa677433222720770762b1c72fcd74b26d3174e9d7a7c028f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -193678,6 +194619,7 @@ self: { homepage = "http://khumba.net/projects/qtah"; description = "Generator for Qtah Qt bindings"; license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ khumba ]; }) {}; "qtah-qt5" = callPackage @@ -193698,6 +194640,7 @@ self: { homepage = "http://khumba.net/projects/qtah"; description = "Qt bindings for Haskell"; license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ khumba ]; }) {qtah = null;}; "quadratic-irrational" = callPackage @@ -194021,8 +194964,8 @@ self: { ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { pname = "quickcheck-combinators"; - version = "0.0.0"; - sha256 = "42fe67cfbab7c215b00e843b773fcee84e28f4ffdae5f43affa21331dcdcb2b5"; + version = "0.0.1"; + sha256 = "bc334ff44f93e580e13cbe07c4ccf5924bf22df943934987f769ebec6800ec8d"; libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; description = "Simple type-level combinators for augmenting QuickCheck instances"; license = stdenv.lib.licenses.bsd3; @@ -194120,7 +195063,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "quickcheck-io" = callPackage + "quickcheck-io_0_1_2" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { pname = "quickcheck-io"; @@ -194132,9 +195075,10 @@ self: { homepage = "https://github.com/hspec/quickcheck-io#readme"; description = "Use HUnit assertions as QuickCheck properties"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "quickcheck-io_0_1_3" = callPackage + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { pname = "quickcheck-io"; @@ -194144,7 +195088,6 @@ self: { homepage = "https://github.com/hspec/quickcheck-io#readme"; description = "Use HUnit assertions as QuickCheck properties"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-poly" = callPackage @@ -194484,6 +195427,26 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "quipper" = callPackage + ({ mkDerivation, base, containers, directory, easyrender, mtl + , process, random, template-haskell, unix + }: + mkDerivation { + pname = "quipper"; + version = "0.7"; + sha256 = "38d86bce23509ff81a0e2964d9c04107c4cbb8ecf799abfed216cc2192dcc47c"; + revision = "1"; + editedCabalFile = "ed852a0a36ec59cf0c95e5cec2d0bc82e19a0576f75236ee986f7a221a721c7b"; + libraryHaskellDepends = [ + base containers directory easyrender mtl process random + template-haskell unix + ]; + jailbreak = true; + homepage = "http://www.mathstat.dal.ca/~selinger/quipper/"; + description = "An embedded, scalable functional programming language for quantum computing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quiver" = callPackage ({ mkDerivation, base, mmorph, transformers }: mkDerivation { @@ -194568,11 +195531,10 @@ self: { ({ mkDerivation, base, dlist, hspec, QuickCheck, quiver }: mkDerivation { pname = "quiver-groups"; - version = "0.1.0.0"; - sha256 = "a2edef17cf3e860afda832181de10055cbc953f3f3bfe3f30227341497fe9104"; + version = "0.1.0.1"; + sha256 = "19a29e6c2011a5fb996d831c594ec6d6d133c3fdb4ad74763e1251d7f1f39255"; libraryHaskellDepends = [ base dlist quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; - jailbreak = true; description = "Group and chunk values within a Quiver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -195860,8 +196822,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "0.2.0"; - sha256 = "426ce15b19dc132b19cc511c74e0a18e0c6caa0b56aa6e1056bda09e1bd2fd96"; + version = "0.3.0"; + sha256 = "08e96d4ad35c562fd4bb651303ee527d0d2e83d45ea026060fec45e3aed6a3e7"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -195872,7 +196834,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ratel-wai" = callPackage + "ratel-wai_0_1_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai }: @@ -195887,6 +196849,23 @@ self: { homepage = "https://github.com/tfausak/ratel-wai#readme"; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ratel-wai" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "0.2.0"; + sha256 = "2714c211ee6252bad68a4f5828c5b196fe4e5fff9dfed778c9bf15918ac35911"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + homepage = "https://github.com/tfausak/ratel-wai#readme"; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = stdenv.lib.licenses.mit; }) {}; "ratio-int" = callPackage @@ -196637,8 +197616,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "0.5.3"; - sha256 = "f5737cb4408b0bf1f19736fa8387d6e92f73d23c49f2455b530232f8f17b64fc"; + version = "0.5.4"; + sha256 = "86fda65310e4b7b83575ed8717780e6295116ff220621ee383b71fa98e09e2f2"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -197578,6 +198557,8 @@ self: { pname = "reflex-dom"; version = "0.3"; sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a"; + revision = "1"; + editedCabalFile = "908cf399bc1af34e18674cad421c0046b667ee8172254fce6e59dae83ce96a6a"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory @@ -198778,7 +199759,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "relational-query" = callPackage + "relational-query_0_8_2_3" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words , template-haskell, text, th-reify-compat, time, time-locale-compat @@ -198799,6 +199780,30 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "relational-query" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, quickcheck-simple, sql-words + , template-haskell, text, th-reify-compat, time, time-locale-compat + , transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.8.3.0"; + sha256 = "8935e9b1f9dfbc7f7c34737db669ebfcbe352beac00ddc45a8b67420f93001ee"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + sql-words template-haskell text th-reify-compat time + time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers quickcheck-simple transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; @@ -201867,6 +202872,7 @@ self: { utf8-string vector ]; testHaskellDepends = [ base doctest ]; + doCheck = false; homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; @@ -202228,7 +203234,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "retry" = callPackage + "retry_0_7_4" = callPackage ({ mkDerivation, base, data-default-class, exceptions, ghc-prim , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers }: @@ -202247,6 +203253,27 @@ self: { homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "retry" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, ghc-prim + , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.4.1"; + sha256 = "d2791b0ea317655c3d5a5d9d1d443eeb66a31953e0a66ac7a510050c54d83fab"; + libraryHaskellDepends = [ + base data-default-class exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions ghc-prim hspec HUnit mtl + QuickCheck random stm time transformers + ]; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; }) {}; "retryer" = callPackage @@ -204112,8 +205139,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.2.0"; - sha256 = "06dbc08b55de6bf54223724248bc5b8407f49cdbd9d03aefb8d682d5603a3721"; + version = "0.1.3.0"; + sha256 = "1acc605f83e2954f01a502095bec89f064a510cfc52a2a08369e4e60542c13e5"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -207471,6 +208498,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semibounded-lattices" = callPackage + ({ mkDerivation, base, containers, lattices, semibounded-lattice }: + mkDerivation { + pname = "semibounded-lattices"; + version = "0.1.0.0"; + sha256 = "433329bceb9eb326cc4f1fdb6a78970cbd278b72d051382baab1a043dddfbce4"; + libraryHaskellDepends = [ base containers lattices ]; + testHaskellDepends = [ base semibounded-lattice ]; + jailbreak = true; + homepage = "https://github.com/xu-hao/semibounded-lattices#readme"; + description = "A Haskell implementation of semibounded lattices"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {semibounded-lattice = null;}; + "semigroupoid-extras_4_0" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { @@ -209913,8 +210955,8 @@ self: { }: mkDerivation { pname = "servant-router"; - version = "0.8.0"; - sha256 = "6d7362d8b7b8928b847ead37d081fc6d5dbfb6e3df1464e24c682b4e1cba2a93"; + version = "0.8.1"; + sha256 = "fe94b7f998f96f29ca148dd89c5367ddacf6c925692660162a0f2c5e9696cbec"; libraryHaskellDepends = [ base bytestring http-api-data http-types mtl network-uri servant text @@ -210328,8 +211370,8 @@ self: { pname = "servant-swagger"; version = "0.1.1"; sha256 = "d89df7e8ee82978f6db32c2f278591df26bcdd6ef4282dff53933d3417d53a6c"; - revision = "1"; - editedCabalFile = "4982e79b812758d953cf852474e97882f826f194b09ba66eed74ec52fceb6f8e"; + revision = "2"; + editedCabalFile = "a6657e0ef2ea025a6b82b19949765fe92301e1d90be3330153789bee8e7959fe"; libraryHaskellDepends = [ aeson base bytestring http-media lens servant swagger2 text unordered-containers @@ -210337,6 +211379,7 @@ self: { testHaskellDepends = [ aeson aeson-qq base hspec lens servant swagger2 text time ]; + jailbreak = true; homepage = "https://github.com/dmjio/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; @@ -212468,8 +213511,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "sharc-timbre"; - version = "0.1"; - sha256 = "cbdedf5c24664d362be1b4a285c4c0021c17126e9a9562c17f23eb174249184d"; + version = "0.2"; + sha256 = "4a5f16ee586d056ff9be7d148ec044f2c004ca67e5d7941a23ea5259929e9fb3"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anton-k/sharc"; description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra."; @@ -214437,10 +215480,9 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "simtreelo"; - version = "0.1.1.0"; - sha256 = "820e7189bb824c3480bb5492ddaf04a3b8200fea747084ab35e15ad46815f8c8"; + version = "0.1.1.1"; + sha256 = "0c990c2e520069d07030f63fc861c1a8c2e287bf2fc2ae4ebf24504d89cd1b64"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "Loader for data organized in a tree"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -215692,6 +216734,26 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "smerdyakov" = callPackage + ({ mkDerivation, base, doctest, exceptions, free, Glob, hspec, mtl + , process, QuickCheck, text, transformers, yaml + }: + mkDerivation { + pname = "smerdyakov"; + version = "0.0.0.0"; + sha256 = "32b6b8bfeebc8915784f9ee0c3df3299fd1b09bf0c70985d0407740c28eea709"; + libraryHaskellDepends = [ + base exceptions free mtl process text transformers + ]; + testHaskellDepends = [ + base doctest exceptions free Glob hspec mtl process QuickCheck text + transformers yaml + ]; + jailbreak = true; + homepage = "http://github.com/jkarni/smerdyakov#README.md"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smoothie_0_1_3" = callPackage ({ mkDerivation, base, linear, vector }: mkDerivation { @@ -219587,24 +220649,22 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, containers, data-default, docopt, entropy , http-conduit, http-kit, http-types, interpolatedstring-perl6 - , network, postgresql-simple, raw-strings-qq, resource-pool, SHA - , split, string-conversions, text, time, tls, unix, utf8-string - , x509, yaml + , network, postgresql-simple, resource-pool, SHA, split, text, time + , tls, unix, utf8-string, x509, yaml }: mkDerivation { pname = "sproxy"; - version = "0.9.6"; - sha256 = "3c35dad6f3b838f51ebd7c70231421cbb34ef5c3a38f3560c926cf7de8a9a5aa"; + version = "0.9.8"; + sha256 = "255f78f65439ad2e8e0f05fe9df5d07b07863b433bda486b67c3a6c4e0a0311a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers data-default docopt entropy http-conduit http-kit http-types - interpolatedstring-perl6 network postgresql-simple raw-strings-qq - resource-pool SHA split string-conversions text time tls unix - utf8-string x509 yaml + interpolatedstring-perl6 network postgresql-simple resource-pool + SHA split text time tls unix utf8-string x509 yaml ]; - description = "HTTP proxy for authenticating users via Google OAuth2"; + description = "HTTP proxy for authenticating users via OAuth2"; license = stdenv.lib.licenses.mit; }) {}; @@ -221748,16 +222808,15 @@ self: { , http-client-tls, http-conduit, lucid, mime-types, monad-unlift , monad-unlift-ref, mono-traversable, mtl, old-locale , optparse-applicative, optparse-simple, process, QuickCheck - , resourcet, safe, semigroups, stackage-install, stm, store - , streaming-commons, syb, system-fileio, system-filepath, tar - , temporary, text, time, transformers, unix-compat - , unordered-containers, utf8-string, vector, xml-conduit, xml-types - , yaml, zlib + , resourcet, safe, semigroups, stm, store, streaming-commons, syb + , system-fileio, system-filepath, tar, temporary, text, time + , transformers, unix-compat, unordered-containers, utf8-string + , vector, xml-conduit, xml-types, yaml, zlib }: mkDerivation { pname = "stackage-curator"; - version = "0.14.1"; - sha256 = "245df3b4c16323c4896422be6eaeb5bc019c52f387399ea8ecfe52e7ad3b4ecb"; + version = "0.14.1.1"; + sha256 = "1db3dee8833fe6e42f1266c9b78a5cbee9b02d6a9c83f4cf7e2c607f4a6ad6d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221767,10 +222826,10 @@ self: { cryptohash-conduit data-default-class directory exceptions filepath hashable html-conduit http-client http-client-tls http-conduit lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stackage-install stm - store streaming-commons syb system-fileio system-filepath tar - temporary text time transformers unix-compat unordered-containers - utf8-string vector xml-conduit xml-types yaml zlib + old-locale process resourcet safe semigroups stm store + streaming-commons syb system-fileio system-filepath tar temporary + text time transformers unix-compat unordered-containers utf8-string + vector xml-conduit xml-types yaml zlib ]; executableHaskellDepends = [ aeson base http-client http-client-tls optparse-applicative @@ -221795,6 +222854,33 @@ self: { pname = "stackage-install"; version = "0.1.0.3"; sha256 = "95bcae12cb795d5edae0edd45ec0827a55ae1a0e35199bfadef1bf0077373ed5"; + revision = "1"; + editedCabalFile = "c0365ebfce87f0fe849850eea8d8c77201879d7817a78e531e5c490363514165"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers cryptohash directory + filepath http-client http-client-tls http-types process stm tar + text + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/fpco/stackage-install"; + description = "Secure download of packages for cabal-install"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "stackage-install_0_1_1_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , cryptohash, directory, filepath, http-client, http-client-tls + , http-types, process, stm, tar, text + }: + mkDerivation { + pname = "stackage-install"; + version = "0.1.1.1"; + sha256 = "46af3ae310cd7691f3b9edf3e17b0078c38b81c2c136c1485718f81e7068b875"; + revision = "1"; + editedCabalFile = "4d211f81f164148b6fd1581e19446c1aeb0d5783d8f5b1d4ec7caca2b784edef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221816,8 +222902,8 @@ self: { }: mkDerivation { pname = "stackage-install"; - version = "0.1.1.1"; - sha256 = "46af3ae310cd7691f3b9edf3e17b0078c38b81c2c136c1485718f81e7068b875"; + version = "0.1.2"; + sha256 = "d46a0dfb3b82a154509fc396d966df642302341bfd758204d72d23e590874843"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223776,6 +224862,7 @@ self: { th-orphans th-reify-many th-utilities time transformers unordered-containers vector vector-binary-instances void weigh ]; + doCheck = false; homepage = "https://github.com/fpco/store#readme"; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; @@ -225346,7 +226433,7 @@ self: { license = stdenv.lib.licenses.mit; }) {stripe-tests = null;}; - "strive" = callPackage + "strive_2_2_2" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-conduit, http-types, markdown-unlit, template-haskell, text , time, transformers @@ -225367,6 +226454,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "strive" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, markdown-unlit + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "strive"; + version = "3.0.0"; + sha256 = "9fa6409127c240846e11d1c7e8746dfa6f5713af90db46cc60f6ff05507556b0"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + testHaskellDepends = [ base bytestring markdown-unlit time ]; + homepage = "https://github.com/tfausak/strive#readme"; + description = "A client for the Strava V3 API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -227215,7 +228322,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "sync-mht" = callPackage + "sync-mht_0_3_8_4" = callPackage ({ mkDerivation, array, base, base16-bytestring, byteable, bytes , bytestring, cereal, containers, cryptohash, directory, exceptions , filepath, HUnit, io-streams, mtl, process, random, regex-compat @@ -227249,6 +228356,43 @@ self: { homepage = "https://github.com/ekarayel/sync-mht"; description = "Fast incremental file transfer using Merkle-Hash-Trees"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "sync-mht" = callPackage + ({ mkDerivation, array, base, base16-bytestring, byteable, bytes + , bytestring, cereal, containers, cryptohash, directory, exceptions + , filepath, HUnit, io-streams, mtl, process, random, regex-compat + , temporary, text, time, transformers, unix, zlib + }: + mkDerivation { + pname = "sync-mht"; + version = "0.3.8.5"; + sha256 = "146c2e789845bbc58c4baf9f4c6e4e9b0908b5518311b321543dd481f90efdaa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base base16-bytestring byteable bytes bytestring cereal + containers cryptohash directory exceptions filepath HUnit + io-streams mtl process random regex-compat temporary text time + transformers unix zlib + ]; + executableHaskellDepends = [ + array base base16-bytestring byteable bytes bytestring cereal + containers cryptohash directory exceptions filepath HUnit + io-streams mtl process random regex-compat temporary text time + transformers unix zlib + ]; + testHaskellDepends = [ + array base base16-bytestring byteable bytes bytestring cereal + containers cryptohash directory exceptions filepath HUnit + io-streams mtl process random regex-compat temporary text time + transformers unix zlib + ]; + jailbreak = true; + homepage = "https://github.com/ekarayel/sync-mht"; + description = "Fast incremental file transfer using Merkle-Hash-Trees"; + license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -228087,6 +229231,19 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "system-locale" = callPackage + ({ mkDerivation, base, hspec, megaparsec, process, time }: + mkDerivation { + pname = "system-locale"; + version = "0.1.0.0"; + sha256 = "0df7815525b55d875e8c0393f22c3595655a90a0701b5208799f97e653686fab"; + libraryHaskellDepends = [ base megaparsec process time ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/cocreature/system-locale"; + description = "Get system locales"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "system-posix-redirect" = callPackage ({ mkDerivation, base, bytestring, unix }: mkDerivation { @@ -231280,14 +232437,16 @@ self: { "test-fixture" = callPackage ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl - , template-haskell + , template-haskell, transformers }: mkDerivation { pname = "test-fixture"; - version = "0.3.1.0"; - sha256 = "2e706aca06eaa8fd3223be69c554c4334d54dcaac43a3bebaa5d7802d599d60b"; + version = "0.4.0.0"; + sha256 = "0601604365bec95ab5407051410f7a857ae19dc6c25fad8bc004756aca02dff0"; libraryHaskellDepends = [ base data-default mtl template-haskell ]; - testHaskellDepends = [ base hspec hspec-discover ]; + testHaskellDepends = [ + base hspec hspec-discover mtl transformers + ]; homepage = "http://github.com/cjdev/test-fixture#readme"; description = "Test monadic side-effects"; license = stdenv.lib.licenses.bsd3; @@ -232628,8 +233787,8 @@ self: { }: mkDerivation { pname = "text-icu-normalized"; - version = "0.1.4.1"; - sha256 = "3ffe3706e994327563568a84e0b41761b235f84ca3b3c307656de406d7b8e2e3"; + version = "0.1.5.1"; + sha256 = "a6b10fe10fbd83c23c6719879a19536ff0fdfb01b4ea42e25e014d59ed29f3a6"; libraryHaskellDepends = [ base base-unicode-symbols bytestring lens text text-icu ]; @@ -234244,6 +235403,7 @@ self: { base bytestring containers directory filepath hspec primitive syb template-haskell text th-orphans vector ]; + doCheck = false; homepage = "https://github.com/fpco/th-utilities#readme"; description = "Collection of useful functions for use with Template Haskell"; license = stdenv.lib.licenses.mit; @@ -234420,8 +235580,8 @@ self: { pname = "these"; version = "0.7"; sha256 = "21959dd626454a9b7f0ac7b57d923802b72d008ca77f752fa8f569698bf6ea10"; - revision = "1"; - editedCabalFile = "d9c6643b3d9565bb5931e24d5b18f5f60293c7644a3bb9298429db8b632b1279"; + revision = "2"; + editedCabalFile = "2b24a8c4430c41db5ee2e58f853f944e4500ce6c2ccd0899502e701312e452c4"; libraryHaskellDepends = [ base bifunctors containers data-default-class hashable mtl profunctors semigroupoids transformers transformers-compat @@ -242516,12 +243676,11 @@ self: { }: mkDerivation { pname = "unordered-graphs"; - version = "0.1.0"; - sha256 = "9c14ac49ccc570dc93aadd45f89c82c92f6872a3077effc16825be81a2e7a9c7"; + version = "0.1.0.1"; + sha256 = "0b4e1024bef803a8a853273175d1735ab8155cc5f4f954a7883701b85a3a7aff"; libraryHaskellDepends = [ base deepseq dlist hashable unordered-containers ]; - jailbreak = true; description = "Graph library using unordered-containers"; license = stdenv.lib.licenses.mit; }) {}; @@ -244752,8 +245911,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.1.0.0"; - sha256 = "f4ca276d10484547ce104a63d0bdb35df60d18a185c5a5db426f97c9e4f69aa2"; + version = "0.2.0.0"; + sha256 = "4e6fb906ca4b7f35995ca2a700f58cfae6bead91319f30c3a2a35ca0ede08d93"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -244868,8 +246027,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: mkDerivation { pname = "varying"; - version = "0.5.0.2"; - sha256 = "86b2972408ebb8e99ca1194c43ac68a6a51ce33b0e4ee627b42b1646bfd758fe"; + version = "0.5.0.3"; + sha256 = "a1eff74bb76c4a6b6af64f4490621f3c8a24deec7d44032dfb90e02fc2c73039"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base transformers ]; @@ -245960,8 +247119,8 @@ self: { ({ mkDerivation, base, binary, data-default-class, deepseq }: mkDerivation { pname = "verbosity"; - version = "0.2.1.0"; - sha256 = "faa4121629a8e397572bb61a37e0dd95e281f68c5f779eb7ee756517796f39d3"; + version = "0.2.2.0"; + sha256 = "5193bd13b2dfd39794248b2b5d79e8b4b2a9681f06a6c196c1dd649363bfa868"; libraryHaskellDepends = [ base binary data-default-class deepseq ]; homepage = "https://github.com/trskop/verbosity"; description = "Simple enum that encodes application verbosity"; @@ -246309,11 +247468,14 @@ self: { pname = "vinyl-plus"; version = "0.1.1"; sha256 = "f8a195c81456db7694f0e44966e2907d90a9417d231a3aece78e9e9a35905697"; + revision = "1"; + editedCabalFile = "008aeff291dd0e3ef96f715783d1d609590103068de788a927d53068353e6ef6"; libraryHaskellDepends = [ base contravariant ghc-prim profunctors transformers unordered-containers vinyl ]; testHaskellDepends = [ base doctest vinyl ]; + jailbreak = true; homepage = "http://github.com/andrew/vinyl-plus"; description = "Vinyl records utilities"; license = stdenv.lib.licenses.bsd3; @@ -249308,7 +250470,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-crowd" = callPackage + "wai-middleware-crowd_0_1_4" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession , containers, cookie, gitrev, http-client, http-client-tls @@ -249335,6 +250497,36 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-middleware-crowd" = callPackage + ({ mkDerivation, authenticate, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, clientsession + , containers, cookie, gitrev, http-client, http-client-tls + , http-reverse-proxy, http-types, optparse-applicative, resourcet + , template-haskell, text, time, transformers, unix-compat, vault + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-crowd"; + version = "0.1.4.1"; + sha256 = "b9bf4c1fe892232a8f3adcaca9407f81cadd2a8926e763eb2ecb35b2e9674d2e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + authenticate base base64-bytestring binary blaze-builder bytestring + case-insensitive clientsession containers cookie http-client + http-client-tls http-types resourcet text time unix-compat vault + wai + ]; + executableHaskellDepends = [ + base bytestring clientsession gitrev http-client http-client-tls + http-reverse-proxy http-types optparse-applicative template-haskell + text transformers wai wai-app-static wai-extra warp + ]; + description = "Middleware and utilities for using Atlassian Crowd authentication"; + license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -266924,18 +268116,19 @@ self: { "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, text, time, unix, zip, zlib + , process, temporary, text, time, unix, zip, zlib }: mkDerivation { pname = "zip-archive"; - version = "0.3.0.2"; - sha256 = "c5367d9bc72d3ceace0508800bab08a120e308ea1f4f5c8d5843fcca36b15313"; + version = "0.3.0.4"; + sha256 = "67a463b23e1694ad7d4d1f6815b009288c9b585bc411eb1754396b830eba8f92"; libraryHaskellDepends = [ array base binary bytestring containers digest directory filepath mtl old-time pretty text time unix zlib ]; testHaskellDepends = [ - base bytestring directory HUnit old-time process time unix + base bytestring directory HUnit old-time process temporary time + unix ]; testToolDepends = [ zip ]; homepage = "http://github.com/jgm/zip-archive"; From c0b5213aad3b906b7403c439c91075bfcd42265d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Jul 2016 19:25:56 +0200 Subject: [PATCH 055/126] haskell-hfsevents: remove obsolete override cabal2nix generates correct build instructions now. Fixes https://github.com/NixOS/nixpkgs/pull/17046. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dad8a9f8f42..2b721b751e9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -204,11 +204,6 @@ self: super: { # on darwin: https://github.com/NixOS/cabal2nix/issues/146. hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; - # hfsevents needs CoreServices in scope - hfsevents = if pkgs.stdenv.isDarwin - then with pkgs.darwin.apple_sdk.frameworks; addBuildTool (addBuildDepends super.hfsevents [Cocoa]) CoreServices - else super.hfsevents; - # FSEvents API is very buggy and tests are unreliable. See # http://openradar.appspot.com/10207999 and similar issues. # https://github.com/haskell-fswatch/hfsnotify/issues/62 From f3dc4d9ec32dba8f9694305f00e2e706f66d8085 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Thu, 28 Apr 2016 20:43:21 +0200 Subject: [PATCH 056/126] superlu: init at 5.2.1 --- ...lib-as-dependency-for-the-unit-tests.patch | 7 ++++ .../science/math/superlu/default.nix | 36 +++++++++++++++++++ .../math/superlu/find-openblas-library.patch | 11 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch create mode 100644 pkgs/development/libraries/science/math/superlu/default.nix create mode 100644 pkgs/development/libraries/science/math/superlu/find-openblas-library.patch diff --git a/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch b/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch new file mode 100644 index 00000000000..29d86238af0 --- /dev/null +++ b/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch @@ -0,0 +1,7 @@ +--- a/TESTING/MATGEN/CMakeLists.txt ++++ b/TESTING/MATGEN/CMakeLists.txt +@@ -97,3 +97,4 @@ if(enable_complex16) + endif() + + add_library(matgen ${sources}) ++target_link_libraries(matgen superlu) diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix new file mode 100644 index 00000000000..9938a3096a0 --- /dev/null +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, cmake, + gfortran, openblasCompat}: + +stdenv.mkDerivation rec { + version = "5.2.1"; + name = "superlu-${version}"; + + src = fetchurl { + url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz"; + sha256 = "0qzlb7cd608q62kyppd0a8c65l03vrwqql6gsm465rky23b6dyr8"; + }; + + buildInputs = [ cmake gfortran ]; + + propagatedBuildInputs = [ openblasCompat ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=true" + "-DUSE_XSDK_DEFAULTS=true" + ]; + + patches = [ + ./find-openblas-library.patch + ./add-superlu-lib-as-dependency-for-the-unit-tests.patch + ]; + + doCheck = true; + checkTarget = "test"; + + meta = { + homepage = http://crd-legacy.lbl.gov/~xiaoye/SuperLU/; + license = http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt; + description = "A library for the solution of large, sparse, nonsymmetric systems of linear equations"; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch b/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch new file mode 100644 index 00000000000..ce7bc6974c9 --- /dev/null +++ b/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,6 +75,8 @@ set(CMAKE_C_FLAGS_RELEASE "-O3" CACHE STRING "") + ###################################################################### + # + #--------------------- BLAS --------------------- ++find_package(OpenBLAS) ++set(TPL_BLAS_LIBRARIES ${OpenBLAS_LIBRARIES}) + if(NOT enable_blaslib) + if (TPL_BLAS_LIBRARIES) + set(BLAS_FOUND TRUE) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c723433bf51..aa5988722e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16382,6 +16382,8 @@ in suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {}; suitesparse = suitesparse_4_4; + superlu = callPackage ../development/libraries/science/math/superlu {}; + ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; }; gmsh = callPackage ../applications/science/math/gmsh { }; From 93dfdf0a0c5aea8ca7391941097566609060fa9a Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Mon, 18 Jul 2016 21:55:26 +0200 Subject: [PATCH 057/126] armadillo: correct dependencies - Remove unused dependencies atlas/blas - Add hdf5/superlu dependency (As superlu needs openblasCompat, we also use it here.) - Add support for darwin - Make use of OpenBLAS-LAPACK in armadillo OpenBLAS (confusingly) contains LAPACK already by default, so we simply use OpenBLAS when searching for LAPACK. The better solution would be for armadillo to use cmake built in FindBLAS/FindLAPACK which both would find OpenBLAS. --- .../libraries/armadillo/default.nix | 25 +++++++++++-------- .../armadillo/use-OpenBLAS-as-LAPACK.patch | 14 +++++++++++ .../armadillo/use-unix-config-on-OS-X.patch | 11 ++++++++ 3 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch create mode 100644 pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 8d904efe0d6..937275b6528 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,23 +1,26 @@ -{stdenv, fetchurl, cmake, pkgconfig, atlas, blas, openblas}: +{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.200.1b"; + version = "7.200.2"; name = "armadillo-${version}"; - + src = fetchurl { - url = "http://sourceforge.net/projects/arma/files/armadillo-${version}.tar.xz"; - sha256 = "00s8xrywc4aipipq1zpd6q9gzqmsiv8cwd25zvb1csrpninmidvc"; + url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; + sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm"; }; - unpackCmd = [ "tar -xf ${src}" ]; - - nativeBuildInputs = [ cmake atlas blas openblas ]; + buildInputs = [ cmake openblasCompat superlu hdf5 ]; + + cmakeFlags = [ "-DDETECT_HDF5=ON" ]; + + patches = [ ./use-unix-config-on-OS-X.patch + ./use-OpenBLAS-as-LAPACK.patch ]; meta = with stdenv.lib; { description = "C++ linear algebra library"; - homepage = "http://arma.sourceforge.net" ; + homepage = http://arma.sourceforge.net; license = licenses.mpl20; - platforms = stdenv.lib.platforms.linux ; - maintainers = [ stdenv.lib.maintainers.juliendehos ]; + platforms = platforms.unix; + maintainers = [ maintainers.juliendehos ]; }; } diff --git a/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch b/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch new file mode 100644 index 00000000000..e4c77d2cc2e --- /dev/null +++ b/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch @@ -0,0 +1,14 @@ +diff --git a/cmake_aux/Modules/ARMA_FindLAPACK.cmake b/cmake_aux/Modules/ARMA_FindLAPACK.cmake +index 5395afb..a203c93 100644 +--- a/cmake_aux/Modules/ARMA_FindLAPACK.cmake ++++ b/cmake_aux/Modules/ARMA_FindLAPACK.cmake +@@ -5,7 +5,7 @@ + # also defined, but not for general use are + # LAPACK_LIBRARY, where to find the LAPACK library. + +-SET(LAPACK_NAMES ${LAPACK_NAMES} lapack) ++SET(LAPACK_NAMES ${LAPACK_NAMES} openblas) + FIND_LIBRARY(LAPACK_LIBRARY + NAMES ${LAPACK_NAMES} + PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib + diff --git a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch b/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch new file mode 100644 index 00000000000..b6fdddcaf2d --- /dev/null +++ b/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,7 +84,7 @@ message(STATUS "DETECT_HDF5 = ${DETECT_HDF5}" ) + ## + ## Find LAPACK and BLAS libraries, or their optimised versions + ## +- ++set(APPLE false) + if(APPLE) + + set(ARMA_OS macos) From bae6ad8efa7aa085f39f6a024f3c06f546b75227 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Jul 2016 15:06:10 +0200 Subject: [PATCH 058/126] uzbl: fix build See also #16740. --- pkgs/applications/networking/browsers/uzbl/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 0fb0db99891..4b768602c6e 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, pkgconfig, python3, makeWrapper, pygtk , webkit, glib_networking, gsettings_desktop_schemas, pythonPackages }: +# This package needs python3 during buildtime, +# but Python 2 + packages during runtime. stdenv.mkDerivation rec { name = "uzbl-v0.9.0"; @@ -22,8 +24,8 @@ stdenv.mkDerivation rec { preConfigure = '' makeFlags="$makeFlags PREFIX=$out" makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out" - mkdir -p $out/lib/python3.4/site-packages/ - export PYTHONPATH=$PYTHONPATH:$out/lib/python3.4/site-packages/ + mkdir -p $out/${python3.sitePackages}/ + export PYTHONPATH=$PYTHONPATH:$out/${python3.sitePackages} ''; preFixup = '' @@ -37,5 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; - buildInputs = [ gsettings_desktop_schemas webkit pygtk pythonPackages.six ]; + buildInputs = [ gsettings_desktop_schemas webkit ]; + propagatedBuildInputs = [ pygtk pythonPackages.six ]; } From 848bf3099f969010b8daed1182e69ffbb5009e51 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 09:45:28 -0400 Subject: [PATCH 059/126] pythonPackages.moto: init at 0.4.25 --- 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 783578b1f1a..83fb269fd4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13019,6 +13019,23 @@ in modules // { }; }; + moto = buildPythonPackage rec { + version = "0.4.25"; + name = "moto-${version}"; + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/df/9e/0b22ac0abf61711c86ae75a0548825e19cc123b522ff3508cbc43924969d/moto-0.4.25.tar.gz"; + sha256 = "1gqm7h6bm5xkspd07bnjwdr2q6cvpxkayx0hkgk8fhkawbg0fqq7"; + }; + + propagatedBuildInputs = with self; [ + # Main dependencies + jinja2 werkzeug flask requests2 six boto httpretty xmltodict + # For tests + nose sure boto3 freezegun + ]; + }; + + mox = buildPythonPackage rec { name = "mox-0.5.3"; From 2173e6b49a16b721db7dd249d9de225278a90b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 19 Jul 2016 15:27:15 +0200 Subject: [PATCH 060/126] lighttpd: 1.4.39 -> 1.4.40 Major bug-fix release; hundreds of issues resolved in issue tracker. https://www.lighttpd.net/2016/7/16/1.4.40/ --- pkgs/servers/http/lighttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index af029cc4db2..8f75461070f 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.39"; + name = "lighttpd-1.4.40"; src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "0nrnhxl1ypzgsms0ky6zdf6ib94vf8x77c422s2xav9x7j2s3fby"; + sha256 = "13agkmxii11kyary7pmv8kw4w1rp15swx800d98nqkb0yzy0sic0"; }; buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] From 332a3e9073a5f2d62b5329e502b9d46d0a17529d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Jul 2016 15:44:09 +0200 Subject: [PATCH 061/126] pythonPackages.etcd: init at 2.0.8 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 83fb269fd4a..8ee30f590e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5834,6 +5834,31 @@ in modules // { propagatedBuildInputs = with self; [ configparser ]; }; + etcd = buildPythonPackage rec { + name = "etcd-${version}"; + version = "2.0.8"; + + # PyPI package is incomplete + src = pkgs.fetchurl { + url = "https://github.com/dsoprea/PythonEtcdClient/archive/${version}.tar.gz"; + sha256 = "0fi6rxa1yxvz7nwrc7dw6fax3041d6bj3iyhywjgbkg7nadi9i8v"; + }; + + patchPhase = '' + sed -i -e '13,14d;37d' setup.py + ''; + + propagatedBuildInputs = with self; [ simplejson pytz requests2 ]; + + # No proper tests are available + doCheck = false; + + meta = { + description = "A Python etcd client that just works"; + homepage = https://github.com/dsoprea/PythonEtcdClient; + license = licenses.gpl2; + }; + }; evdev = buildPythonPackage rec { version = "0.4.7"; From 9dae8a7e458f9a9f1fa99d613b07b3ffa9cb5e15 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Jul 2016 16:00:46 +0200 Subject: [PATCH 062/126] pythonPackages.python-etcd: init at 0.4.3 --- 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 8ee30f590e8..c46c5d3c8c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19488,6 +19488,27 @@ in modules // { }; }; + python-etcd = buildPythonPackage rec { + name = "python-etcd-${version}"; + version = "0.4.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/python-etcd/${name}.tar.gz"; + sha256 = "cf53262b3890d185fe637eed15fe39c8d7a8261864ddcd7037b22c961456d7fc"; + }; + + buildInputs = with self; [ nose mock pyopenssl ]; + + propagatedBuildInputs = with self; [ urllib3 dns]; + + + meta = { + description = "A python client for Etcd"; + homepage = http://github.com/jplana/python-etcd; + license = licenses.mit; + }; + }; + pytz = buildPythonPackage rec { name = "pytz-${version}"; From e0476c2512b5b0a71d1c6b6ea53f81ed608c7019 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 10:12:30 -0400 Subject: [PATCH 063/126] pythonPackages.moto: add checkPhase, but leave it turned off Someday we'll turn it on, but the side-effecting tests aren't going to work on Hydra right now. --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c46c5d3c8c6..9b222cae354 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13058,6 +13058,11 @@ in modules // { # For tests nose sure boto3 freezegun ]; + + checkPhase = "nosetests"; + + # TODO: make this true; I think lots of the tests want network access but we can probably run the others + doCheck = false; }; From dd5cf8059096c32ab85392bb0c06d3865152e8cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Jul 2016 16:22:17 +0200 Subject: [PATCH 064/126] pythonPackages.ghp-import: disable tests --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b222cae354..c352a3b6bd9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27126,6 +27126,9 @@ in modules // { LC_ALL="en_US.UTF-8"; + # No tests available + doCheck = false; + meta = { description = "Copy your docs directly to the gh-pages branch"; homepage = "http://github.com/davisp/ghp-import"; From 48c32dc0b77636036b2b2ff04aa25d9a3c40b0dc Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 19 Jul 2016 14:33:15 +0000 Subject: [PATCH 065/126] nixops: update to 1.4 (cherry picked from commit 9909d31602f6242259bcf7d31e88107fa5f1fb5f) --- pkgs/tools/package-management/nixops/default.nix | 4 ++-- pkgs/tools/package-management/nixops/generic.nix | 6 ++++++ pkgs/tools/package-management/nixops/unstable.nix | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index b49491cf15f..bba392e30e7 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.3.1"; + version = "1.4"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "04j8s0gg1aj3wmj1bs7dwscfmlzk2xpwfw9rk4xzxwxw1y0j64nd"; + sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd"; }; }) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 023ec07dba1..7948ebc43fb 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -17,6 +17,12 @@ pythonPackages.buildPythonApplication { pythonPackages.sqlite3 pythonPackages.hetzner pythonPackages.libcloud + pythonPackages.azure-storage + pythonPackages.azure-mgmt-compute + pythonPackages.azure-mgmt-network + pythonPackages.azure-mgmt-resource + pythonPackages.azure-mgmt-storage + pythonPackages.adal ]; doCheck = false; diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 40d56518b3d..bba392e30e7 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "2015-12-18"; + version = "1.4"; src = fetchurl { - url = "http://hydra.nixos.org/build/29118371/download/2/nixops-1.3.1pre1673_a0d5681.tar.bz2"; - sha256 = "177lnlfz32crcc0gjmh1gn5y2xs142kmb4b68k4raxcxxw118kw9"; + url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd"; }; }) From fe46fa9d175cf0f3dae3ca2ccef40d7833454185 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 19 Jul 2016 16:40:31 +0200 Subject: [PATCH 066/126] =?UTF-8?q?pharo-vm5:=202016.05.04=20=E2=87=92=202?= =?UTF-8?q?016.07.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/pharo/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 0ebbb34f8ae..aca5c37d265 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -16,12 +16,12 @@ rec { }; pharo-spur = pharo-vm-build rec { - version = "2016.05.04"; + version = "2016.07.16"; name = "pharo-vm-spur-i386-${version}"; binary-basename = "pharo-spur-vm"; src = fetchurl { url = "${base-url}/pharo-vm-spur-${version}.tar.bz2"; - sha256 = "01xvpcp9mslxmfjpi43jhgf8jnx20dqngwrfyi838il61128hwq2"; + sha256 = "07nk4w5wh7gcf27cch5paqp9zdlshnknpv4y7imxlkjd76viac2b"; }; }; } From 78eac466b0f9ea964d7f8b3e473b93584c76bf44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 19 Jul 2016 16:49:46 +0200 Subject: [PATCH 067/126] nixos/ddclient: add warning about password being world readable Closes #16885. --- nixos/modules/services/networking/ddclient.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 633ceaebfa4..005c57dce7c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -48,7 +48,7 @@ in default = ""; type = str; description = '' - Password. + Password. WARNING: The password becomes world readable in the Nix store. ''; }; From 3563be8dd6eddebf486e4974e9ab137fb7fe0bfe Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 19 Jul 2016 15:10:54 +0000 Subject: [PATCH 068/126] gradle: 2.14 -> 2.14.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index dabc7b0d7f2..533808243a2 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,11 +51,11 @@ rec { }; gradleLatest = gradleGen rec { - name = "gradle-2.14"; + name = "gradle-2.14.1"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1m98m4cxnvyl5ymkj6z8xb9vpdna47hdh5qrfblqkijjnqrlyfwr"; + sha256 = "0fggjxpsnakdaviw7bn2jmsl06997phlqr1251bjmlgjf7d1xing"; }; }; From 9b658d51cb746cfffcc60aa4dc27b60f2ab3e228 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 18 Jul 2016 15:00:23 -0400 Subject: [PATCH 069/126] gd: cherry-pick a temporary patch for darwin --- pkgs/development/libraries/gd/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index f4386a22ffa..cf0ed7883a0 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -8,6 +8,7 @@ , libXpm ? null , fontconfig , freetype +, fetchpatch, autoreconfHook, perl }: stdenv.mkDerivation rec { @@ -19,7 +20,17 @@ stdenv.mkDerivation rec { sha256 = "1311g5mva2xlzqv3rjqjc4jjkn5lzls4skvr395h633zw1n7b7s8"; }; - nativeBuildInputs = [ pkgconfig ]; + # Address an incompatibility with Darwin's libtool + patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = https://github.com/libgd/libgd/commit/502e4cd873c3b37b307b9f450ef827d40916c3d6.patch; + sha256 = "0gawr2c4zr6cljnwzhdlxhz2mkbg0r5vzvr79dv6yf6fcj06awfs"; + }); + + # -pthread gets passed to clang, causing warnings + configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no"; + + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optionals stdenv.isDarwin [ autoreconfHook perl ]; buildInputs = [ zlib fontconfig freetype ]; propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ]; From 6ef6c5a6f69640db9e3290e95ce50eb75892c01d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 19 Jul 2016 12:34:53 -0500 Subject: [PATCH 070/126] qt55: add missing module setup hook --- pkgs/development/libraries/qt-5/5.5/default.nix | 2 ++ pkgs/development/libraries/qt-5/5.5/setup-hook.sh | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.5/setup-hook.sh diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 9cfc052e730..24b4c749853 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -49,6 +49,8 @@ let outputs = args.outputs or [ "dev" "out" ]; setOutputFlags = args.setOutputFlags or false; + setupHook = ./setup-hook.sh; + enableParallelBuilding = args.enableParallelBuilding or true; meta = self.qtbase.meta // (args.meta or {}); diff --git a/pkgs/development/libraries/qt-5/5.5/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/setup-hook.sh new file mode 100644 index 00000000000..e41433c1138 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/setup-hook.sh @@ -0,0 +1,2 @@ +NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" +NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" From d130c27c62d39348d1eda5c580072c7d9e826253 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 19 Jul 2016 12:35:04 -0500 Subject: [PATCH 071/126] pyqt5: run configure hooks Fixes #17045. Whenever a phase is overridden, the pre- and post-hooks for that phase must be invoked! --- pkgs/development/python-modules/pyqt/5.x.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 71fb5cb3657..7ec89ffd7ee 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -27,6 +27,8 @@ in stdenv.mkDerivation { propagatedBuildInputs = [ sip ]; configurePhase = '' + runHook preConfigure + mkdir -p $out lndir ${pythonDBus} $out @@ -39,11 +41,14 @@ in stdenv.mkDerivation { ${python.executable} configure.py -w \ --confirm-license \ --dbus=$out/include/dbus-1.0 \ + --qmake=$QMAKE \ --no-qml-plugin \ --bindir=$out/bin \ --destdir=$out/lib/${python.libPrefix}/site-packages \ --sipdir=$out/share/sip \ --designer-plugindir=$out/plugins/designer + + runHook postConfigure ''; postInstall = '' From 4a86f9a44f9fa10d9150ec04f71123af5157dc4e Mon Sep 17 00:00:00 2001 From: Jiri Marsicek Date: Mon, 18 Jul 2016 23:37:47 +0200 Subject: [PATCH 072/126] gfxtablet: git-2013-10-21 -> 1.4 --- pkgs/os-specific/linux/gfxtablet/default.nix | 32 +++++++++----------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix index 36397b77b77..9fc052c5ac1 100644 --- a/pkgs/os-specific/linux/gfxtablet/default.nix +++ b/pkgs/os-specific/linux/gfxtablet/default.nix @@ -1,32 +1,30 @@ -{stdenv, fetchgit, linuxHeaders}: -let - s = # Generated upstream information - rec { - version="git-2013-10-21"; - name = "gfxtablet-uinput-driver-${version}"; - rev = "c4e337ae0b53a8ccdfe11b904ff129714bd25ec4"; - sha256 = "14ll9rls2mamllmpwjiv2dc6165plazv7ny9cliylafrwgb55l7p"; - url = "https://github.com/rfc2822/GfxTablet.git"; - }; +{stdenv, fetchFromGitHub, linuxHeaders}: + +stdenv.mkDerivation rec { + version = "1.4"; + name = "gfxtablet-uinput-driver-${version}"; + buildInputs = [ linuxHeaders ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchgit { - inherit (s) url sha256 rev; + + src = fetchFromGitHub { + owner = "rfc2822"; + repo = "GfxTablet"; + rev = "android-app-${version}"; + sha256 = "1i2m98yypfa9phshlmvjlgw7axfisxmldzrvnbzm5spvv5s4kvvb"; }; + preBuild = ''cd driver-uinput''; + installPhase = '' mkdir -p "$out/bin" cp networktablet "$out/bin" mkdir -p "$out/share/doc/gfxtablet/" cp ../*.md "$out/share/doc/gfxtablet/" ''; + meta = { - inherit (s) version; description = ''Uinput driver for Android GfxTablet tablet-as-input-device app''; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; From db8e69dea9d0ac20088dfaf5235dcf07e0ff5582 Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Tue, 19 Jul 2016 16:57:02 -0400 Subject: [PATCH 073/126] aws_shell: 0.1.0 -> 0.1.1 This also fixes https://github.com/awslabs/aws-shell/issues/118 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bdf5491746..4486d31ba91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1401,13 +1401,13 @@ in modules // { aws_shell = buildPythonPackage rec { name = "aws-shell-${version}"; - version = "0.1.0"; + version = "0.1.1"; src = pkgs.fetchurl { - sha256 = "05isyrqbk16dg1bc3mnc4ynxr3nchslvia5wr1sdmxvc3v2y729d"; - url = "mirror://pypi/a/aws-shell/aws-shell-0.1.0.tar.gz"; + sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; + url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz"; }; propagatedBuildInputs = with self; [ - configobj prompt_toolkit_52 awscli boto3 pygments sqlite3 mock pytest + configobj prompt_toolkit awscli boto3 pygments sqlite3 mock pytest pytestcov unittest2 tox ]; From 4ddaf12dc68552f6d0c0b70af3fb1b9bf48b60b4 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Tue, 19 Jul 2016 23:15:08 +0200 Subject: [PATCH 074/126] vifm: 0.8.1 -> 0.8.2 --- pkgs/applications/misc/vifm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index e5f3011e6ba..2e8f747e724 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "vifm-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2"; - sha256 = "0yf3xc4czdrcbvmhq7d4xkck5phrmxwybmnv1zdb56qg56baq64r"; + sha256 = "07r15kq7kjl3a41sd11ncpsii866xxps4f90zh3lv8jqcrv6silb"; }; nativeBuildInputs = [ pkgconfig ]; From b5f22e070a61cefeb0c2c0d699bcdf417c02d24c Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 18:13:33 -0400 Subject: [PATCH 075/126] pythonPackages.hvac: init at 0.2.15 --- pkgs/top-level/python-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c352a3b6bd9..d2804c429f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11150,6 +11150,18 @@ in modules // { }; }; + hvac = buildPythonPackage rec { + name = "hvac-${version}"; + version = "0.2.15"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/11/ba/6101780891b9d55f6174fa78b47d462c8c1f0cde34072b45fc39f7f8a77c/hvac-0.2.15.tar.gz"; + sha256 = "0qxa4g1ij1bj27mbp8l54lcr7d5krkb2rayisc6shkpf2b51ip4c"; + }; + + propagatedBuildInputs = with self; [ requests2 ]; + }; + hypothesis1 = buildPythonPackage rec { name = "hypothesis-1.14.0"; From 7ac4d7702eea5f8a4de83aec15526d4a14cd9529 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 18:15:38 -0400 Subject: [PATCH 076/126] pythonPackages.credstash: init at 1.11.0 --- pkgs/top-level/python-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2804c429f3..d186430075d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3879,6 +3879,18 @@ in modules // { }; }; + credstash = buildPythonPackage rec { + name = "credstash-${version}"; + version = "1.11.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/e2/64/6abae87b8da07c262d50b51eed540096ed1f6e01539bf2f2d4c3f718c8c6/credstash-1.11.0.tar.gz"; + sha256 = "03qm8bjfskzkkmgcy5dr70x9pxabjb3fi0v0nxicg1kryy64k0dz"; + }; + + propagatedBuildInputs = with self; [ pycrypto boto3 docutils ]; + }; + cython = buildPythonPackage rec { name = "Cython-${version}"; version = "0.24"; From cfa10cd20b1526cd33f552e55888f177c0a01496 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 18:16:51 -0400 Subject: [PATCH 077/126] pythonPackages.timeout-decorator: init at 0.3.2 --- pkgs/top-level/python-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d186430075d..99700f82da5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21587,6 +21587,16 @@ in modules // { }; }; + timeout-decorator = buildPythonPackage rec { + name = "timeout-decorator-${version}"; + version = "0.3.2"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/t/timeout-decorator/${name}.tar.gz"; + sha256 = "1x9l8bwdk72if2d5h5mi4lcaidbsmyh0iz114cfyyj1rzz5rxqaf"; + }; + }; + pid = buildPythonPackage rec { name = "pid-${version}"; version = "2.0.1"; From b3adffcd5681bbf579cd78da4e8698c683fb66cc Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 19 Jul 2016 18:17:50 -0400 Subject: [PATCH 078/126] pythonPackages.pychef: init at 0.3.0 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99700f82da5..19d47e1146f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21618,6 +21618,21 @@ in modules // { }; }; + pychef = buildPythonPackage rec { + name = "PyChef-${version}"; + version = "0.3.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/f9/31/17cde137e3b8ada4d7c80fd4504264f2abed329a9a8100c3622a044c485e/PyChef-0.3.0.tar.gz"; + sha256 = "0zdz8lw545cd3a34cpib7mdwnad83gr2mrrxyj3v74h4zhwabhmg"; + }; + + propagatedBuildInputs = with self; [ six requests2 mock unittest2 ]; + + # FIXME + doCheck = false; + }; + pydns = buildPythonPackage rec { name = "pydns-2.3.6"; disabled = isPy3k; From 2311673aa9e0794b2f161d5e0e6d163f898d5f63 Mon Sep 17 00:00:00 2001 From: Dmytro Rets Date: Wed, 20 Jul 2016 01:16:24 +0200 Subject: [PATCH 079/126] pythonPackages.jenkinsapi: init at 0.2.32 --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 56816bb206c..c9fbdeb7bb5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -110,6 +110,7 @@ dmalikov = "Dmitry Malikov "; dochang = "Desmond O. Chang "; doublec = "Chris Double "; + drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; ebzzry = "Rommel Martinez "; ederoyd46 = "Matthew Brown "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c352a3b6bd9..c306380c14c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27189,6 +27189,27 @@ in modules // { }; }; + jenkinsapi = buildPythonPackage rec { + name = "jenkinsapi-${version}"; + version = "0.2.32"; + + src = pkgs.fetchurl { + url = "mirror://pypi/j/jenkinsapi/${name}.tar.gz"; + sha256 = "0fcc78b8dfc87237942aad2a8be54dbc08bc4afceaa7f6897f3d894e7d4bfd22"; + }; + + propagatedBuildInputs = with self; [ pytz requests2 ]; + + buildInputs = with self; [ coverage mock nose unittest2 ]; + + meta = { + description = "A Python API for accessing resources on a Jenkins continuous-integration server"; + homepage = https://github.com/salimfadhley/jenkinsapi; + maintainers = with maintainers; [ drets ]; + license = licenses.mit; + }; + }; + jenkins-job-builder = buildPythonPackage rec { name = "jenkins-job-builder-1.4.0"; disabled = ! (isPy26 || isPy27); From 584b667efc08addee7ca4322bc259611b45d8532 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 18 Jul 2016 20:10:33 +0300 Subject: [PATCH 080/126] ddrescue: lzip is a nativeBuildInput --- pkgs/tools/system/ddrescue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index b436b6ecf96..173c2623e18 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1b71hb42lh33y9843nd1mxlwkk9qh9ajvnz6ivzd1jq9lav4x7ph"; }; - buildInputs = [ lzip ]; + nativeBuildInputs = [ lzip ]; doCheck = true; From 8d62f62a7807c52a764a68bb4818f75d08fdc417 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 17 Jul 2016 04:20:23 +0300 Subject: [PATCH 081/126] stdenv: Remove unpack-bootstrap-tools-arm.sh This file was using the 'double patchelf' hack, which hasn't been needed for a while, after the original patchelf bug was fixed: https://github.com/NixOS/patchelf/commit/65a4dc6aa982191b11c739c4c9b802c7fa4cbebb --- pkgs/stdenv/linux/default.nix | 5 +- .../scripts/unpack-bootstrap-tools-arm.sh | 64 ------------------- 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index fbadfa80fe1..e3aeafe178d 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -42,10 +42,7 @@ rec { builder = bootstrapFiles.busybox; - args = if system == "armv5tel-linux" then - [ "ash" "-e" ./scripts/unpack-bootstrap-tools-arm.sh ] - else - [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; + args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; tarball = bootstrapFiles.bootstrapTools; diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh deleted file mode 100644 index 4fe86776e3b..00000000000 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh +++ /dev/null @@ -1,64 +0,0 @@ -set -e - -# Unpack the bootstrap tools tarball. -echo Unpacking the bootstrap tools... -$builder mkdir $out -< $tarball $builder unxz | $builder tar x -C $out - -# Set the ELF interpreter / RPATH in the bootstrap binaries. -echo Patching the bootstrap tools... - -# On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So -# use a copy of patchelf. -LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? $out/bin/cp $out/bin/patchelf . - -for i in $out/bin/* $out/libexec/gcc/*/*/* $out/lib/librt*; do - if test ${i%.la} != $i; then continue; fi - if test ${i%*.so*} != $i; then continue; fi - if ! test -f $i; then continue; fi - if test -L $i; then continue; fi - echo patching $i - LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ - $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i - LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ - $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i -done -for i in $out/lib/librt* $out/lib/libcloog* $out/lib/libppl* $out/lib/libgmp* $out/lib/libpcre*; do - if ! test -f $i; then continue; fi - if test -L $i; then continue; fi - echo patching $i - LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ - $out/bin/patchelf --set-rpath $out/lib --force-rpath $i - LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ - $out/bin/patchelf --set-rpath $out/lib --force-rpath $i -done - -# Fix the libc linker script. -export PATH=$out/bin -cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp -mv $out/lib/libc.so.tmp $out/lib/libc.so -cat $out/lib/libpthread.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libpthread.so.tmp -mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so - -# Provide some additional symlinks. -ln -s bash $out/bin/sh -ln -s bzip2 $out/bin/bunzip2 - -# Provide a gunzip script -cat > $out/bin/gunzip < $out/bin/egrep -echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep -echo "#! $out/bin/sh" > $out/bin/fgrep -echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep - -# Provide xz (actually only xz -d will work). -echo "#! $out/bin/sh" > $out/bin/xz -echo "exec $builder unxz \"\$@\"" >> $out/bin/xz - -chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/xz From 2fefa331e76413abb39eda1128462d254e5fbdfa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 1 Jun 2016 22:52:03 +0300 Subject: [PATCH 082/126] busybox: Fix cross build with musl --- pkgs/os-specific/linux/busybox/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 92f24b9e9ae..296b19bc5b6 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -64,7 +64,11 @@ stdenv.mkDerivation rec { EOF make oldconfig - '' + lib.optionalString useMusl '' + + runHook postConfigure + ''; + + postConfigure = lib.optionalString useMusl '' makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; @@ -73,10 +77,11 @@ stdenv.mkDerivation rec { crossAttrs = { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" - '' + - (if stdenv.cross.platform.kernelMajor == "2.4" then '' - CONFIG_IONICE n - '' else ""); + ''; + + postConfigure = stdenv.lib.optionalString useMusl '' + makeFlagsArray+=("CC=$crossConfig-gcc -isystem ${musl.crossDrv}/include -B${musl.crossDrv}/lib -L${musl.crossDrv}/lib") + ''; }; enableParallelBuilding = true; From 953249db34d2c385cdeef0e50e6449f736a8bb65 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 17 Mar 2016 13:55:13 +0200 Subject: [PATCH 083/126] platforms.nix: kirkwood_defconfig is gone, use multi_v5_defconfig kirkwood_defconfig was removed in 3.17, and our kernel headers are based on 4.4. Make this change to allow the armv5tel bootstrap tarball to build again (I can't test it, though). --- pkgs/top-level/platforms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 83859f821d8..0c2056928c3 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -24,7 +24,7 @@ rec { sheevaplug = { name = "sheevaplug"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "kirkwood_defconfig"; + kernelHeadersBaseConfig = "multi_v5_defconfig"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; From 9f0dc294da55783c4636b68a78f755754606f2c7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 5 Jan 2016 11:25:53 +0200 Subject: [PATCH 084/126] make-bootstrap-tools-cross.nix: Add/fix some .so dependencies - cloog, ppl, cloogppl aren't used by recent GCCs. Kill references to them. - Use correct versions of isl, as the current GCC depends on non-default versions of them. - Also clarify isl dynamic libraries are needed in cross builds, but not in native builds - Since aeb3d8c (bzip2: fix cross build on mingw by using autoconf patch), it seems that the bzip2 binary depends on libbz2 when cross compiling. So copy libbz2 into the bootstrap tarball as well. - Curl isn't used in the bootstrap tools since e6f61b4cf3388. --- .../linux/make-bootstrap-tools-cross.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 6dfe1bf41e4..8dce40b08a7 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -74,15 +74,13 @@ let gcc = pkgs.gcc.cc.crossDrv; gmpxx = pkgs.gmpxx.crossDrv; mpfr = pkgs.mpfr.crossDrv; - ppl = pkgs.ppl.crossDrv; - cloogppl = pkgs.cloogppl.crossDrv; - cloog = pkgs.cloog.crossDrv; zlib = pkgs.zlib.crossDrv; - isl = pkgs.isl.crossDrv; libmpc = pkgs.libmpc.crossDrv; binutils = pkgs.binutils.crossDrv; libelf = pkgs.libelf.crossDrv; + # Keep these versions in sync with the versions used in the current GCC! + isl = pkgs.isl_0_14.crossDrv; in rec { @@ -94,12 +92,6 @@ rec { singleBinary = "symlinks"; })).crossDrv; - curlMinimal = (pkgs.curl.override { - zlibSupport = false; - sslSupport = false; - scpSupport = false; - }).crossDrv; - busyboxMinimal = (pkgs.busybox.override { # TBD: uClibc is broken. # useUclibc = true; @@ -172,8 +164,6 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp ${curlMinimal}/bin/curl $out/bin - cp -d ${curlMinimal}/lib/libcurl* $out/lib cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep @@ -206,10 +196,13 @@ rec { cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib - # TBD: Why are these needed for cross but not native tools? - cp -d ${cloogppl}/lib/libcloog*.so* $out/lib - cp -d ${cloog}/lib/libcloog*.so* $out/lib + # These needed for cross but not native tools because the stdenv + # GCC has certain things built in statically. See + # pkgs/stdenv/linux/default.nix for the details. cp -d ${isl}/lib/libisl*.so* $out/lib + # Also this is needed since bzip2 uses a custom build system + # for native builds but autoconf (via a patch) for cross builds + cp -d ${bzip2}/lib/libbz2.so* $out/lib # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do From 171c7f0e63b0f92c71c73b756cbbd91b8ddce444 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 17 Jul 2016 00:11:34 +0300 Subject: [PATCH 085/126] make-bootstrap-tools-cross.nix: Have more consistency with platforms.nix E.g. we had `arch = "arm"` in the former and `arch = "armv6"` in the latter. Try to have some more consistency. --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 12 ++++++------ pkgs/top-level/platforms.nix | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 8dce40b08a7..32f287cdc4c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -8,9 +8,9 @@ let sheevaplugCrossSystem = { crossSystem = rec { - config = "armv5tel-unknown-linux-gnueabi"; + config = "arm-linux-gnueabi"; bigEndian = false; - arch = "arm"; + arch = "armv5te"; float = "soft"; withTLS = true; libc = "glibc"; @@ -21,9 +21,9 @@ let raspberrypiCrossSystem = { crossSystem = rec { - config = "armv6l-unknown-linux-gnueabi"; + config = "arm-linux-gnueabihf"; bigEndian = false; - arch = "arm"; + arch = "armv6"; float = "hard"; fpu = "vfp"; withTLS = true; @@ -36,9 +36,9 @@ let armv7l-hf-multiplatform-crossSystem = { crossSystem = rec { - config = "armv7l-unknown-linux-gnueabi"; + config = "arm-linux-gnueabihf"; bigEndian = false; - arch = "arm"; + arch = "armv7-a"; float = "hard"; fpu = "vfpv3-d16"; withTLS = true; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 0c2056928c3..1be8c7ad264 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -129,6 +129,10 @@ rec { # Only for uboot = uboot : ubootConfig = "sheevaplug_config"; kernelDTB = true; # Beyond 3.10 + gcc = { + arch = "armv5te"; + float = "soft"; + }; }; raspberrypi = { From 0968641edad9a4655c3edf82d5946af3f4433ea1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 1 Jun 2016 22:52:34 +0300 Subject: [PATCH 086/126] make-bootstrap-tools-cross.nix: Use busybox with musl Do this because I cannot figure out how to refer to `glibc.static` inside busybox when cross building in a manner that works. --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 32f287cdc4c..868e6f209e9 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -93,8 +93,7 @@ rec { })).crossDrv; busyboxMinimal = (pkgs.busybox.override { - # TBD: uClibc is broken. - # useUclibc = true; + useMusl = true; enableStatic = true; enableMinimal = true; extraConfig = '' From 954e54f563b8e75a91b4241e043f1e4e3f0ca81f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 1 Jun 2016 23:01:57 +0300 Subject: [PATCH 087/126] make-bootstrap-tools-cross.nix: Reference correct outputs --- .../linux/make-bootstrap-tools-cross.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 868e6f209e9..11db5d8b7eb 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -164,15 +164,15 @@ rec { cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep + cp -d ${gnugrep.pcre.crossDrv.out}/lib/libpcre*.so* $out/lib # needed by grep # Copy what we need of GCC. - cp -d ${gcc}/bin/gcc $out/bin - cp -d ${gcc}/bin/cpp $out/bin - cp -d ${gcc}/bin/g++ $out/bin - cp -d ${gcc}/lib*/libgcc_s.so* $out/lib - cp -d ${gcc}/lib*/libstdc++.so* $out/lib - cp -rd ${gcc}/lib/gcc $out/lib + cp -d ${gcc.out}/bin/gcc $out/bin + cp -d ${gcc.out}/bin/cpp $out/bin + cp -d ${gcc.out}/bin/g++ $out/bin + cp -d ${gcc.lib}/lib*/libgcc_s.so* $out/lib + cp -d ${gcc.lib}/lib*/libstdc++.so* $out/lib + cp -rd ${gcc.out}/lib/gcc $out/lib chmod -R u+w $out/lib rm -f $out/lib/gcc/*/*/include*/linux rm -f $out/lib/gcc/*/*/include*/sound @@ -180,18 +180,18 @@ rec { rm -f $out/lib/gcc/*/*/include-fixed/asm rm -rf $out/lib/gcc/*/*/plugin #rm -f $out/lib/gcc/*/*/*.a - cp -rd ${gcc}/libexec/* $out/libexec + cp -rd ${gcc.out}/libexec/* $out/libexec chmod -R u+w $out/libexec rm -rf $out/libexec/gcc/*/*/plugin mkdir $out/include - cp -rd ${gcc}/include/c++ $out/include + cp -rd ${gcc.out}/include/c++ $out/include chmod -R u+w $out/include rm -rf $out/include/c++/*/ext/pb_ds rm -rf $out/include/c++/*/ext/parallel - cp -d ${gmpxx}/lib/libgmp*.so* $out/lib + cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib - cp -d ${libmpc}/lib/libmpc*.so* $out/lib + cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib @@ -201,11 +201,11 @@ rec { cp -d ${isl}/lib/libisl*.so* $out/lib # Also this is needed since bzip2 uses a custom build system # for native builds but autoconf (via a patch) for cross builds - cp -d ${bzip2}/lib/libbz2.so* $out/lib + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do - cp ${binutils}/bin/$i $out/bin + cp ${binutils.out}/bin/$i $out/bin done cp -d ${binutils.out}/lib/lib*.so* $out/lib From 5cbb6ac151dbb1596c0001138ece5312be67e5f0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 17 Jul 2016 03:40:45 +0300 Subject: [PATCH 088/126] make-bootstrap-tools-cross.nix: More syncs from the non-cross version --- .../linux/make-bootstrap-tools-cross.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 11db5d8b7eb..b688cca1f69 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -65,7 +65,6 @@ let gnused = pkgs.gnused.crossDrv; gnugrep = pkgs.gnugrep.crossDrv; gawk = pkgs.gawk.crossDrv; - gnutar = pkgs.gnutar.crossDrv; gzip = pkgs.gzip.crossDrv; bzip2 = pkgs.bzip2.crossDrv; gnumake = pkgs.gnumake.crossDrv; @@ -85,6 +84,7 @@ in rec { + coreutilsMinimal = (pkgs.coreutils.override (args: { # We want coreutils without ACL support. aclSupport = false; @@ -92,6 +92,8 @@ rec { singleBinary = "symlinks"; })).crossDrv; + tarMinimal = (pkgs.gnutar.override { acl = null; }).crossDrv; + busyboxMinimal = (pkgs.busybox.override { useMusl = true; enableStatic = true; @@ -107,19 +109,16 @@ rec { ''; }).crossDrv; - inherit pkgs; - build = stdenv.mkDerivation { - name = "build"; + name = "stdenv-bootstrap-tools-cross"; + crossConfig = stdenv.cross.config; buildInputs = [nukeReferences cpio binutilsCross]; - crossConfig = stdenv.cross.config; - buildCommand = '' - set -x + set -x mkdir -p $out/bin $out/lib $out/libexec # Copy what we need of Glibc. @@ -137,7 +136,15 @@ rec { cp -d ${glibc.out}/lib/crt?.o $out/lib cp -rL ${glibc.dev}/include $out - chmod -R u+w $out/include + chmod -R u+w "$out" + + # glibc can contain linker scripts: find them, copy their deps, + # and get rid of absolute paths (nuke-refs would make them useless) + local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib") + cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u) + for f in $lScripts; do + substituteInPlace "$f" --replace '${glibc.out}/lib/' "" + done # Hopefully we won't need these. rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video @@ -157,7 +164,7 @@ rec { cp -d ${gnugrep}/bin/grep $out/bin cp ${gawk}/bin/gawk $out/bin cp -d ${gawk}/bin/awk $out/bin - cp ${gnutar}/bin/tar $out/bin + cp ${tarMinimal}/bin/tar $out/bin cp ${gzip}/bin/gzip $out/bin cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin From 53c039b96a8c6c31a79fb3b3d7a95f6295dd7164 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 17 Jul 2016 06:34:31 +0300 Subject: [PATCH 089/126] make-bootstrap-tools-cross.nix: Support 'dist' target --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index b688cca1f69..0bc8c64be63 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -247,6 +247,15 @@ rec { allowedReferences = []; }; + dist = stdenv.mkDerivation { + name = "stdenv-bootstrap-tools-cross"; + + buildCommand = '' + mkdir -p $out/nix-support + echo "file tarball ${build}/on-server/bootstrap-tools.tar.xz" >> $out/nix-support/hydra-build-products + echo "file busybox ${build}/on-server/busybox" >> $out/nix-support/hydra-build-products + ''; + }; } ); in { From 3d509896511fac1c73307fedf2060c9dddebf73a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 19 Jul 2016 01:04:53 +0300 Subject: [PATCH 090/126] make-bootstrap-tools{,-cross}.nix: Create deterministic tars --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 0bc8c64be63..522c28905a8 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -235,7 +235,7 @@ rec { mv $out/.pack $out/pack mkdir $out/on-server - tar cvfJ $out/on-server/bootstrap-tools.tar.xz -C $out/pack . + tar cvfJ $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . cp ${busyboxMinimal}/bin/busybox $out/on-server chmod u+w $out/on-server/busybox nuke-refs $out/on-server/busybox diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 866906662ae..1ecb222af3e 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -146,7 +146,7 @@ rec { mv $out/.pack $out/pack mkdir $out/on-server - tar cvfJ $out/on-server/bootstrap-tools.tar.xz -C $out/pack . + tar cvfJ $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . cp ${busyboxMinimal}/bin/busybox $out/on-server chmod u+w $out/on-server/busybox nuke-refs $out/on-server/busybox From d0e25d815ce610c34581860abc1269408323ca1e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 11 Jul 2016 14:45:29 +0300 Subject: [PATCH 091/126] release-cross.nix: Drop any platforms not having a single working build --- pkgs/top-level/release-cross.nix | 204 ------------------------------- 1 file changed, 204 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ced90c0489c..c0cac8c8103 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -50,95 +50,6 @@ in { }); }) // ( -/* Test some cross builds to the Sheevaplug - uclibc*/ -let - crossSystem = { - config = "armv5tel-unknown-linux-gnueabi"; - bigEndian = false; - arch = "arm"; - float = "soft"; - withTLS = true; - platform = pkgs.platforms.sheevaplug; - libc = "uclibc"; - openssl.system = "linux-generic32"; - uclibc.extraConfig = '' - CONFIG_ARM_OABI n - CONFIG_ARM_EABI y - ARCH_BIG_ENDIAN n - ARCH_WANTS_BIG_ENDIAN n - ARCH_WANTS_LITTLE_ENDIAN y - LINUXTHREADS_OLD y - ''; - }; - -in { - crossSheevaplugLinuxUclibc = mapTestOnCross crossSystem ( - basic // - { - ubootSheevaplug.crossDrv = nativePlatforms; - }); -}) // ( - -/* Test some cross builds to the mipsel */ -let - crossSystem = { - config = "mipsel-unknown-linux"; - bigEndian = false; - arch = "mips"; - float = "soft"; - withTLS = true; - libc = "uclibc"; - platform = { - name = "malta"; - kernelMajor = "2.4"; - kernelBaseConfig = "defconfig-malta"; - kernelHeadersBaseConfig = "defconfig-malta"; - uboot = null; - kernelArch = "mips"; - kernelAutoModules = false; - kernelTarget = "vmlinux"; - }; - openssl.system = "linux-generic32"; - uclibc.extraConfig = '' - ARCH_BIG_ENDIAN n - ARCH_WANTS_BIG_ENDIAN n - ARCH_WANTS_LITTLE_ENDIAN y - LINUXTHREADS_OLD y - - # Without this, it does not build for linux 2.4 - UCLIBC_SUSV4_LEGACY y - ''; - }; -in { - crossMipselLinux24 = mapTestOnCross crossSystem basic; -}) // ( - -/* Test some cross builds to the ultrasparc */ -let - crossSystem = { - config = "sparc64-unknown-linux"; - bigEndian = true; - arch = "sparc64"; - float = "hard"; - withTLS = true; - libc = "glibc"; - platform = { - name = "ultrasparc"; - kernelMajor = "2.6"; - kernelHeadersBaseConfig = "sparc64_defconfig"; - kernelBaseConfig = "sparc64_defconfig"; - kernelArch = "sparc"; - kernelAutoModules = false; - kernelTarget = "zImage"; - uboot = null; - }; - openssl.system = "linux64-sparcv9"; - gcc.cpu = "ultrasparc"; - }; -in { - crossUltraSparcLinux = mapTestOnCross crossSystem basic; -}) // ( - /* Test some cross builds on 32 bit mingw-w64 */ let crossSystem = { @@ -182,52 +93,6 @@ in { }; }) // ( -/* GNU aka. GNU/Hurd. */ -let - crossSystem = { - config = "i586-pc-gnu"; - bigEndian = false; - arch = "i586"; - float = "hard"; - withTLS = true; - platform = pkgs.platforms.pc32; - libc = "glibc"; - openssl.system = "hurd-x86"; # Nix depends on OpenSSL. - }; -in { - crossGNU = mapTestOnCross crossSystem { - gnu.hurdCross = nativePlatforms; - gnu.mach.crossDrv = nativePlatforms; - gnu.mig = nativePlatforms; - gnu.smbfs.crossDrv = nativePlatforms; - - coreutils.crossDrv = nativePlatforms; - ed.crossDrv = nativePlatforms; - grub2.crossDrv = nativePlatforms; - inetutils.crossDrv = nativePlatforms; - boehmgc.crossDrv = nativePlatforms; - findutils.crossDrv = nativePlatforms; - gcc.crossDrv = nativePlatforms; - gcc46.crossDrv = nativePlatforms; - gdb.crossDrv = nativePlatforms; - gmp.crossDrv = nativePlatforms; - gnugrep.crossDrv = nativePlatforms; - gnumake.crossDrv = nativePlatforms; - gnused.crossDrv = nativePlatforms; - guile_1_8.crossDrv = nativePlatforms; - guile.crossDrv = nativePlatforms; - libffi.crossDrv = nativePlatforms; - libtool.crossDrv = nativePlatforms; - libunistring.crossDrv = nativePlatforms; - lsh.crossDrv = nativePlatforms; - nixUnstable.crossDrv = nativePlatforms; - openssl.crossDrv = nativePlatforms; # dependency of Nix - patch.crossDrv = nativePlatforms; - samba_light.crossDrv = nativePlatforms; # needed for `runInGenericVM' - zile.crossDrv = nativePlatforms; - }; -}) // ( - /* Linux on the fuloong */ let crossSystem = { @@ -266,75 +131,6 @@ in { }; }) // ( -/* Linux on the Ben Nanonote */ -let - crossSystem = { - config = "mipsel-unknown-linux"; - bigEndian = false; - arch = "mips"; - float = "soft"; - withTLS = true; - libc = "glibc"; - platform = { - name = "ben_nanonote"; - kernelMajor = "2.6"; - kernelBaseConfig = "qi_lb60_defconfig"; - kernelHeadersBaseConfig = "malta_defconfig"; - uboot = "nanonote"; - kernelArch = "mips"; - kernelAutoModules = false; - kernelTarget = "vmlinux.bin"; - kernelExtraConfig = '' - SOUND y - SND y - SND_MIPS y - SND_SOC y - SND_JZ4740_SOC y - SND_JZ4740_SOC_QI_LB60 y - FUSE_FS m - MIPS_FPU_EMU y - ''; - }; - openssl.system = "linux-generic32"; - perl.arch = "mipsel-unknown"; - uclibc.extraConfig = '' - CONFIG_MIPS_ISA_1 n - CONFIG_MIPS_ISA_MIPS32 y - CONFIG_MIPS_N32_ABI n - CONFIG_MIPS_O32_ABI y - ARCH_BIG_ENDIAN n - ARCH_WANTS_BIG_ENDIAN n - ARCH_WANTS_LITTLE_ENDIAN y - LINUXTHREADS_OLD y - ''; - gcc = { - abi = "32"; - arch = "mips32"; - }; - mpg123.cpu = "generic_nofpu"; - }; -in { - nanonote = mapTestOnCross crossSystem { - - coreutils.crossDrv = nativePlatforms; - ed.crossDrv = nativePlatforms; - inetutils.crossDrv = nativePlatforms; - nixUnstable.crossDrv = nativePlatforms; - patch.crossDrv = nativePlatforms; - zile.crossDrv = nativePlatforms; - prboom.crossDrv = nativePlatforms; - vim.crossDrv = nativePlatforms; - lynx.crossDrv = nativePlatforms; - patchelf.crossDrv = nativePlatforms; - nix.crossDrv = nativePlatforms; - fossil.crossDrv = nativePlatforms; - binutils.crossDrv = nativePlatforms; - mpg123.crossDrv = nativePlatforms; - yacas.crossDrv = nativePlatforms; - }; -}) // ( - - /* Linux on Raspberrypi */ let crossSystem = { From ee1a647bc292248f4745fa040b4d5ed75117d227 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 18 Jul 2016 20:43:13 +0300 Subject: [PATCH 092/126] release-cross.nix: Remove bunch of packages that don't build --- pkgs/top-level/release-cross.nix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index c0cac8c8103..9823bd7b910 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -9,13 +9,6 @@ let busybox.crossDrv = nativePlatforms; coreutils.crossDrv = nativePlatforms; dropbear.crossDrv = nativePlatforms; - tigervnc.crossDrv = nativePlatforms; - wxGTK.crossDrv = nativePlatforms; - #firefox = nativePlatforms; - xorg = { - #xorgserver.crossDrv = nativePlatforms; - }; - nixUnstable.crossDrv = nativePlatforms; }; /* Basic list of packages to be natively built, @@ -123,11 +116,7 @@ in { coreutils.crossDrv = nativePlatforms; ed.crossDrv = nativePlatforms; - grub2.crossDrv = nativePlatforms; - inetutils.crossDrv = nativePlatforms; - nixUnstable.crossDrv = nativePlatforms; patch.crossDrv = nativePlatforms; - zile.crossDrv = nativePlatforms; }; }) // ( @@ -154,23 +143,13 @@ in { rpi = mapTestOnCross crossSystem { coreutils.crossDrv = nativePlatforms; ed.crossDrv = nativePlatforms; - inetutils.crossDrv = nativePlatforms; - nixUnstable.crossDrv = nativePlatforms; patch.crossDrv = nativePlatforms; vim.crossDrv = nativePlatforms; - tmux.crossDrv = nativePlatforms; - screen.crossDrv = nativePlatforms; - unrar.crossDrv = nativePlatforms; unzip.crossDrv = nativePlatforms; - hdparm.crossDrv = nativePlatforms; ddrescue.crossDrv = nativePlatforms; - git.crossDrv = nativePlatforms; lynx.crossDrv = nativePlatforms; patchelf.crossDrv = nativePlatforms; - nix.crossDrv = nativePlatforms; - fossil.crossDrv = nativePlatforms; binutils.crossDrv = nativePlatforms; mpg123.crossDrv = nativePlatforms; - yacas.crossDrv = nativePlatforms; }; }) From cd645c417a162debb695691b0b94ef438ac21f39 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 18 Jul 2016 00:04:51 +0300 Subject: [PATCH 093/126] release-cross.nix: Build the bootstrap tools for ARM --- pkgs/top-level/release-cross.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 9823bd7b910..f670eaea98a 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -152,4 +152,13 @@ in { binutils.crossDrv = nativePlatforms; mpg123.crossDrv = nativePlatforms; }; +}) // ( + +/* Cross-built bootstrap tools for every supported platform */ +let + tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; + maintainers = [ pkgs.lib.maintainers.dezgeg ]; + mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist); +in { + bootstrapTools = pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools; }) From 322faf92196ddf282703ddc608e221eeaaa6578c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 17 Jul 2016 00:14:22 +0300 Subject: [PATCH 094/126] platforms.nix: Switch ARMv7 to vfpv3-d16 Make ARMv7 compatible with non-NEON chips, changing to the same float ABI that Debian and Arch Linux use. This is apparently required for the binaries to work on Scaleway, for instance. --- pkgs/top-level/platforms.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 1be8c7ad264..3c94501b1a5 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -417,11 +417,12 @@ rec { # Cortex-A15: -mfpu=neon-vfpv4 # More about FPU: - #https://wiki.debian.org/ArmHardFloatPort/VfpComparison + # https://wiki.debian.org/ArmHardFloatPort/VfpComparison - # We try to be compatible with beaglebone by now + # vfpv3-d16 is what Debian uses and seems to be the best compromise: NEON is not supported in e.g. Scaleway or Tegra 2, + # and the above page suggests NEON is only an improvement with hand-written assembly. arch = "armv7-a"; - fpu = "neon"; + fpu = "vfpv3-d16"; float = "hard"; # For Raspberry Pi the 2 the best would be: From ad16c9ac31f4eb2b5a6b5a4615df8e9ea4c3a405 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 19 Jul 2016 21:52:19 +0300 Subject: [PATCH 095/126] Revert "spidermonkey: Disable tests on ARM" This reverts commit f9654a88e76703a80b8d1464f384bba21abeaf52. At least for now, the problem has gone away on ARMv7 by the switch of FPU flags used by GCC. Some details of the bug at: https://github.com/NixOS/nixpkgs/pull/16850#issuecomment-232339143 --- pkgs/development/interpreters/spidermonkey/17.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index 5cd3ff0cca6..cbe2c47594d 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.isArm; # fails on v7 with "Alignment trap: not handling instruction" in kernel log + doCheck = true; preCheck = '' rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 From 6c4ba06597be6efec7e2036c76d4dd8d2e53443c Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Sun, 3 Jul 2016 21:32:51 +1000 Subject: [PATCH 096/126] spidermonkey: Fix building 185-1.0.0 on ARMv7. --- .../interpreters/spidermonkey/185-1.0.0.nix | 15 +- .../interpreters/spidermonkey/arm-flags.patch | 342 ++++++++++++++++++ 2 files changed, 353 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/interpreters/spidermonkey/arm-flags.patch diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index 779f0ef26d4..b3fa96d756a 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }: +{ stdenv, autoconf213, fetchurl, pkgconfig, nspr, perl, python, zip }: stdenv.mkDerivation rec { version = "185-1.0.0"; @@ -12,17 +12,21 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; buildInputs = [ pkgconfig perl python zip ]; + nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else []; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" export LIBXUL_DIST=$out + ${if stdenv.isArm then "autoreconf --verbose --force" else ""} ''; - # Explained below in configureFlags for ARM patches = stdenv.lib.optionals stdenv.isArm [ + # Explained below in configureFlags for ARM ./findvanilla.patch + # Fix for hard float flags. + ./arm-flags.patch ]; patchFlags = "-p3"; @@ -33,12 +37,15 @@ stdenv.mkDerivation rec { # of polkit, which is what matters most, it does not override the allocator # so the failure of that test does not matter much. configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ - stdenv.lib.optionals stdenv.isArm [ + stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ "--with-cpu-arch=armv5t" "--disable-tracejit" ]; # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 - preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; + preBuild = '' + touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl} + ${if stdenv.isArm then "rm -r jit-test/tests/jaeger/bug563000" else ""} + ''; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/spidermonkey/arm-flags.patch b/pkgs/development/interpreters/spidermonkey/arm-flags.patch new file mode 100644 index 00000000000..721aff154e3 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/arm-flags.patch @@ -0,0 +1,342 @@ +From: Mike Hommey +Date: Wed, 27 Apr 2011 08:58:01 +0200 +Subject: Bug 626035 - Modify the way arm compiler flags are set in configure + +--- + configure.in | 292 ++++++++++++++++++++++++++++++++------------------- + js/src/configure.in | 284 ++++++++++++++++++++++++++++++++----------------- + 2 files changed, 372 insertions(+), 204 deletions(-) + +Index: mozjs-1.8.5-1.0.0+dfsg/js/src/configure.in +=================================================================== +--- mozjs-1.8.5-1.0.0+dfsg.orig/js/src/configure.in 2012-01-21 15:57:37.507703219 +0100 ++++ mozjs-1.8.5-1.0.0+dfsg/js/src/configure.in 2012-01-21 15:58:04.951703302 +0100 +@@ -3535,34 +3535,6 @@ + AC_CHECK_LIB(socket, socket) + esac + +-AC_MSG_CHECKING(for ARM SIMD support in compiler) +-AC_TRY_COMPILE([], +- [asm("uqadd8 r1, r1, r2");], +- result="yes", result="no") +-AC_MSG_RESULT("$result") +-if test "$result" = "yes"; then +- AC_DEFINE(HAVE_ARM_SIMD) +- HAVE_ARM_SIMD=1 +-fi +-AC_SUBST(HAVE_ARM_SIMD) +- +-AC_MSG_CHECKING(for ARM NEON support in compiler) +-_SAVE_CFLAGS="$CFLAGS" +-if test "$GNU_CC"; then +- # gcc needs -mfpu=neon to recognize NEON instructions +- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp" +-fi +-AC_TRY_COMPILE([], +- [asm("vadd.i8 d0, d0, d0");], +- result="yes", result="no") +-AC_MSG_RESULT("$result") +-if test "$result" = "yes"; then +- AC_DEFINE(HAVE_ARM_NEON) +- HAVE_ARM_NEON=1 +-fi +-CFLAGS="$_SAVE_CFLAGS" +-AC_SUBST(HAVE_ARM_NEON) +- + dnl ======================================================== + dnl = pthread support + dnl = Start by checking whether the system support pthreads +@@ -4614,13 +4586,11 @@ + BUILD_STATIC_LIBS= + ENABLE_TESTS=1 + +-MOZ_THUMB2= + USE_ARM_KUSER= + + case "${target}" in + arm-android-eabi) + USE_ARM_KUSER=1 +- MOZ_THUMB2=1 + ;; + esac + +@@ -4666,80 +4636,204 @@ + dnl ======================================================== + MOZ_ARG_HEADER(Individual module options) + +-dnl Setup default CPU arch for arm target +-case "$target_cpu" in +- arm*) +- MOZ_ARM_ARCH=armv7 +- ;; +-esac + dnl ======================================================== +-dnl = Enable building the Thumb2 instruction set ++dnl = ARM toolchain tweaks + dnl ======================================================== +-MOZ_ARG_ENABLE_BOOL(thumb2, +- [ --enable-thumb2 Enable Thumb2 instruction set (implies ARMv7)], +- MOZ_THUMB2=1, +- MOZ_THUMB2=) +-if test -n "$MOZ_THUMB2"; then +- MOZ_ARM_ARCH=armv7 ++ ++dnl Defaults ++case "${target}" in ++arm-android-eabi) ++ MOZ_THUMB=yes ++ MOZ_ARCH=armv7-a ++ MOZ_FPU=vfp ++ MOZ_FLOAT_ABI=softfp ++ ;; ++arm*-*) ++ if test -n "$MOZ_PLATFORM_MAEMO"; then ++ MOZ_THUMB=no ++ MOZ_ARCH=armv7-a ++ MOZ_FLOAT_ABI=softfp ++ fi ++ if test "$MOZ_PLATFORM_MAEMO" = 6; then ++ MOZ_THUMB=yes ++ fi ++ ;; ++esac ++ ++dnl Kept for compatibility with some buildbot mozconfig ++MOZ_ARG_DISABLE_BOOL(thumb2, [], MOZ_THUMB=no, MOZ_THUMB=yes) ++ ++MOZ_ARG_WITH_STRING(thumb, ++[ --with-thumb[[=yes|no|toolchain]]] ++[ Use Thumb instruction set (-mthumb)], ++ if test -z "$GNU_CC"; then ++ AC_MSG_ERROR([--with-thumb is not supported on non-GNU toolchains]) ++ fi ++ MOZ_THUMB=$withval) ++ ++MOZ_ARG_WITH_STRING(thumb-interwork, ++[ --with-thumb-interwork[[=yes|no|toolchain]] ++ Use Thumb/ARM instuctions interwork (-mthumb-interwork)], ++ if test -z "$GNU_CC"; then ++ AC_MSG_ERROR([--with-thumb-interwork is not supported on non-GNU toolchains]) ++ fi ++ MOZ_THUMB_INTERWORK=$withval) ++ ++MOZ_ARG_WITH_STRING(arch, ++[ --with-arch=[[type|toolchain]] ++ Use specific CPU features (-march=type)], ++ if test -z "$GNU_CC"; then ++ AC_MSG_ERROR([--with-arch is not supported on non-GNU toolchains]) ++ fi ++ MOZ_ARCH=$withval) ++ ++MOZ_ARG_WITH_STRING(fpu, ++[ --with-fpu=[[type|toolchain]] ++ Use specific FPU type (-mfpu=type)], ++ if test -z "$GNU_CC"; then ++ AC_MSG_ERROR([--with-fpu is not supported on non-GNU toolchains]) ++ fi ++ MOZ_FPU=$withval) ++ ++MOZ_ARG_WITH_STRING(float-abi, ++[ --with-float-abi=[[type|toolchain]] ++ Use specific arm float ABI (-mfloat-abi=type)], ++ if test -z "$GNU_CC"; then ++ AC_MSG_ERROR([--with-float-abi is not supported on non-GNU toolchains]) ++ fi ++ MOZ_FLOAT_ABI=$withval) ++ ++MOZ_ARG_WITH_STRING(soft-float, ++[ --with-soft-float[[=yes|no|toolchain]] ++ Use soft float library (-msoft-float)], ++ if test -z "$GNU_CC"; then ++ AC_MSG_ERROR([--with-soft-float is not supported on non-GNU toolchains]) ++ fi ++ MOZ_SOFT_FLOAT=$withval) ++ ++case "$MOZ_ARCH" in ++toolchain|"") ++ arch_flag="" ++ ;; ++*) ++ arch_flag="-march=$MOZ_ARCH" ++ ;; ++esac ++ ++case "$MOZ_THUMB" in ++yes) ++ MOZ_THUMB2=1 ++ thumb_flag="-mthumb" ++ ;; ++no) ++ MOZ_THUMB2= ++ thumb_flag="-marm" ++ ;; ++*) ++ _SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$arch_flag" ++ AC_TRY_COMPILE([],[return sizeof(__thumb2__);], ++ MOZ_THUMB2=1, ++ MOZ_THUMB2=) ++ CFLAGS="$_SAVE_CFLAGS" ++ thumb_flag="" ++ ;; ++esac ++ ++if test "$MOZ_THUMB2" = 1; then ++ AC_DEFINE(MOZ_THUMB2) + fi + +-dnl ======================================================== +-dnl = Enable building for ARM specific CPU features +-dnl ======================================================== +-MOZ_ARG_WITH_STRING(cpu-arch, +-[ --with-cpu-arch=arch Use specific arm architecture CPU features, default armv7], +- MOZ_ARM_ARCH=$withval) ++case "$MOZ_THUMB_INTERWORK" in ++yes) ++ thumb_interwork_flag="-mthumb-interwork" ++ ;; ++no) ++ thumb_interwork_flag="-mno-thumb-interwork" ++ ;; ++*) # toolchain ++ thumb_interwork_flag="" ++ ;; ++esac + +-if test -n "$MOZ_THUMB2"; then +- case "$target_cpu" in +- arm*) +- if test "$MOZ_ARM_ARCH" != "armv7"; then +- AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH]) +- fi +- if test "$GNU_CC"; then +- AC_DEFINE(MOZ_THUMB2) +- AC_DEFINE(MOZ_ARM_ARCH) +- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" +- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" +- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" +- else +- AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) +- fi ++case "$MOZ_FPU" in ++toolchain|"") ++ fpu_flag="" + ;; +- *) +- AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures]) ++*) ++ fpu_flag="-mfpu=$MOZ_FPU" + ;; +- esac +-elif test "$MOZ_ARM_ARCH" = "armv7"; then +- case "$target_cpu" in +- arm*) +- if test "$GNU_CC"; then +- AC_DEFINE(MOZ_ARM_ARCH) +- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" +- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" +- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" +- else +- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains]) +- fi ++esac ++ ++case "$MOZ_FLOAT_ABI" in ++toolchain|"") ++ float_abi_flag="" + ;; +- *) +- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures]) ++*) ++ float_abi_flag="-mfloat-abi=$MOZ_FLOAT_ABI" + ;; +- esac +-else +- case "$target_cpu" in +- arm*) +- if test "$GNU_CC"; then +- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float" +- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float" +- ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float" +- fi +- ;; +- esac ++esac ++ ++case "$MOZ_SOFT_FLOAT" in ++yes) ++ soft_float_flag="-msoft-float" ++ ;; ++no) ++ soft_float_flag="-mno-soft-float" ++ ;; ++*) # toolchain ++ soft_float_flag="" ++ ;; ++esac ++ ++dnl Use echo to avoid accumulating space characters ++all_flags=`echo $arch_flag $thumb_flag $thumb_interwork_flag $fpu_flag $float_abi_flag $soft_float_flag` ++if test -n "$all_flags"; then ++ _SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$all_flags" ++ AC_MSG_CHECKING(whether the chosen combination of compiler flags ($all_flags) works) ++ AC_TRY_COMPILE([],[return 0;], ++ AC_MSG_RESULT([yes]), ++ AC_MSG_ERROR([no])) ++ ++ CFLAGS="$_SAVE_CFLAGS $all_flags" ++ CXXFLAGS="$CXXFLAGS $all_flags" ++ ASFLAGS="$ASFLAGS $all_flags" ++ if test -n "$thumb_flag"; then ++ LDFLAGS="$LDFLAGS $thumb_flag" ++ fi + fi + + AC_SUBST(MOZ_THUMB2) +-AC_SUBST(MOZ_ARM_ARCH) ++ ++if test "$CPU_ARCH" = "arm"; then ++ AC_MSG_CHECKING(for ARM SIMD support in compiler) ++ # We try to link so that this also fails when ++ # building with LTO. ++ AC_TRY_LINK([], ++ [asm("uqadd8 r1, r1, r2");], ++ result="yes", result="no") ++ AC_MSG_RESULT("$result") ++ if test "$result" = "yes"; then ++ AC_DEFINE(HAVE_ARM_SIMD) ++ HAVE_ARM_SIMD=1 ++ fi ++ ++ AC_MSG_CHECKING(for ARM NEON support in compiler) ++ # We try to link so that this also fails when ++ # building with LTO. ++ AC_TRY_LINK([], ++ [asm(".fpu neon\n vadd.i8 d0, d0, d0");], ++ result="yes", result="no") ++ AC_MSG_RESULT("$result") ++ if test "$result" = "yes"; then ++ AC_DEFINE(HAVE_ARM_NEON) ++ HAVE_ARM_NEON=1 ++ fi ++fi # CPU_ARCH = arm ++ ++AC_SUBST(HAVE_ARM_SIMD) ++AC_SUBST(HAVE_ARM_NEON) + + dnl ======================================================== + dnl = +@@ -6147,12 +6241,6 @@ + if test "$OS_ARCH" = "OS2"; then + ac_configure_args="$ac_configure_args CFLAGS=-Zomf AR=emxomfar" + fi +- if test -n "$MOZ_THUMB2"; then +- ac_configure_args="$ac_configure_args --enable-thumb2" +- fi +- if test -n "$MOZ_ARM_ARCH"; then +- ac_configure_args="$ac_configure_args --with-cpu-arch=$MOZ_ARM_ARCH" +- fi + + # Use a separate cache file for libffi, since it does things differently + # from our configure. From cde9fb47a9027e95b452dca23d451dc7ec3a2c0a Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Sun, 3 Jul 2016 21:34:14 +1000 Subject: [PATCH 097/126] spidermonkey: Fix building 31.5 on GCC 5. --- pkgs/development/interpreters/spidermonkey/31.5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.5.nix index 4ee6658f59c..3943de2d8f9 100644 --- a/pkgs/development/interpreters/spidermonkey/31.5.nix +++ b/pkgs/development/interpreters/spidermonkey/31.5.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/js/src"; preConfigure = '' + export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out ''; From 33a1d8080b50bdbf0143f4513db2fb4fe3acbd2e Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Sun, 3 Jul 2016 21:34:33 +1000 Subject: [PATCH 098/126] spidermonkey: Enable tests on 31.5. --- pkgs/development/interpreters/spidermonkey/31.5.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.5.nix index 3943de2d8f9..0a71dc567b2 100644 --- a/pkgs/development/interpreters/spidermonkey/31.5.nix +++ b/pkgs/development/interpreters/spidermonkey/31.5.nix @@ -27,9 +27,6 @@ stdenv.mkDerivation rec { "--with-system-ffi" "--enable-readline" - # there is at least one unfixed issue building the tests, so I didn't bother - "--disable-tests" - # enabling these because they're wanted by 0ad. They may or may # not be good defaults for other uses. "--enable-gcgenerational" @@ -44,9 +41,6 @@ stdenv.mkDerivation rec { # to re-enable parallel builds if the source revision changes. enableParallelBuilding = false; - # see comment by --disable-tests - doCheck = false; - postFixup = '' # The headers are symlinks to a directory that doesn't get put # into $out, so they end up broken. Fix that by just resolving the From 54b037720d8f72c58c6585e86b979edaae3fcae9 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sun, 17 Jul 2016 02:08:43 -0700 Subject: [PATCH 099/126] purple-hangouts-hg: init at 2016-07-17 --- .../purple-hangouts/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix new file mode 100644 index 00000000000..494496e4807 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchhg, pidgin, glib, json_glib, protobuf, protobufc }: + +stdenv.mkDerivation rec { + name = "purple-hangouts-hg-${version}"; + version = "2016-07-17"; + + src = fetchhg { + url = "https://bitbucket.org/EionRobb/purple-hangouts/"; + rev = "2c60a5e"; + sha256 = "1m8132ywg9982q3yiqgy1hzm61wkgi590425pp8yk1q03yipd6zb"; + }; + + buildInputs = [ pidgin glib json_glib protobuf protobufc ]; + + installPhase = '' + install -Dm755 -t $out/lib/pidgin/ libhangouts.so + for size in 16 22 24 48; do + install -TDm644 hangouts$size.png $out/pixmaps/pidgin/protocols/$size/hangouts.png + done + ''; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/EionRobb/purple-hangouts; + description = "Native Hangouts support for pidgin"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ ralith ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d606e24612..f67d78c04e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13910,6 +13910,8 @@ in pidginwindowmerge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; + purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; From fcfec7507b3db27d1f17091602057f510591bb97 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Mon, 18 Jul 2016 20:44:46 -0700 Subject: [PATCH 100/126] qt5ct: init at 0.24 --- pkgs/tools/misc/qt5ct/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/qt5ct/default.nix diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix new file mode 100644 index 00000000000..dd94e379eed --- /dev/null +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper}: + +stdenv.mkDerivation rec { + name = "qt5ct-${version}"; + version = "0.24"; + + src = fetchurl { + url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2"; + sha256 = "0k62nd945pbgkshycijzrgdyrwj5kcswk33slaj7hr7d6r7bmb6p"; + }; + + buildInputs = [ qtbase qtsvg ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ]; + + preConfigure = '' + qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins/platformthemes/" + ''; + + preFixup = '' + wrapQtProgram $out/bin/qt5ct + ''; + + meta = with stdenv.lib; { + description = "Qt5 Configuration Tool"; + homepage = https://www.opendesktop.org/content/show.php?content=168066; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ ralith ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d606e24612..9a1759183dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8903,6 +8903,8 @@ in qt5 = self.qt56; + qt5ct = qt5.callPackage ../tools/misc/qt5ct { }; + qt5LibsFun = self: with self; { accounts-qt = callPackage ../development/libraries/accounts-qt { }; From 33ef911d3d5e679399312693f68af068439e8f17 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 20 Jul 2016 09:48:25 +0300 Subject: [PATCH 101/126] perl-Math-Calc-Units: init at 1.07 --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 31607fe2bf2..3007f08906c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7632,6 +7632,18 @@ let self = _self // overrides; _self = with self; { }; }; + MathCalcUnits = buildPerlPackage rec { + name = "Math-Calc-Units-1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SF/SFINK/${name}.tar.gz"; + sha256 = "13wgbxv2fmigdj0vf7nwkq1y2q07jgfj8wdrpqkywfxv4zdwzqv1"; + }; + meta = { + description = "Human-readable unit-aware calculator"; + license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + }; + }; + MathBigInt = buildPerlPackage rec { name = "Math-BigInt-1.999724"; src = fetchurl { From f0fcbb072e89f2986b540c32610b8f25d2e72970 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 20 Jul 2016 09:48:49 +0300 Subject: [PATCH 102/126] perl-Monitoring-Plugin: init at 0.39 --- pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3007f08906c..d50237f06d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8306,6 +8306,25 @@ let self = _self // overrides; _self = with self; { }; }; + MonitoringPlugin = buildPerlPackage rec { + name = "Monitoring-Plugin-0.39"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NI/NIERLEIN/${name}.tar.gz"; + sha256 = "030cw86j8712z8rn66k935gbilb5rcj3lnk4n53vh1b2phrszvjw"; + }; + buildInputs = [ TestMore ]; + propagatedBuildInputs = [ + Carp ClassAccessor ConfigTiny + MathCalcUnits ParamsValidate ]; + meta = { + description = '' + A family of perl modules to streamline writing Naemon, + Nagios, Icinga or Shinken (and compatible) plugins + ''; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IOPipely = buildPerlPackage rec { name = "IO-Pipely-0.005"; src = fetchurl { From c93ffb95bcebd6b64713df8dc07b0c77c9bb858e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 16 Jul 2016 16:58:15 +0200 Subject: [PATCH 103/126] grsecurity: enable support for setting pax flags via xattrs While useless for binaries within the Nix store, user xattrs are a convenient alternative for setting PaX flags to executables outside of the store. To use disable secure memory protections for a non-store file foo, do $ setfattr -n user.pax.flags -v em foo --- pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 894f2d8e364..67bad8aeb40 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -14,7 +14,7 @@ GRKERNSEC_CONFIG_VIRT_KVM y GRKERNSEC_CONFIG_PRIORITY_SECURITY y PAX_PT_PAX_FLAGS y -PAX_XATTR_PAX_FLAGS n +PAX_XATTR_PAX_FLAGS y PAX_EI_PAX n GRKERNSEC_PROC_GID 0 From 55120ac4cb6ee9c051006508390c48649301e6db Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 20 Jul 2016 10:14:00 +0200 Subject: [PATCH 104/126] grsecurity: 4.6.4-201607112205 -> 4.6.4-201607192040 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 7b2feaf84a8..ddb1ccce91b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -94,8 +94,8 @@ rec { grsecurity_testing = grsecPatch { kver = "4.6.4"; - grrev = "201607112205"; - sha256 = "16j01qqa7yi5yvli1lkl8ffybhy4697nyi18lbl5329zd09xq2ww"; + grrev = "201607192040"; + sha256 = "14l52halck6lwbpahz3fmv7q5cx22r77k1hqfnn29a66ws9ra6sz"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 1681718e2fd81c2613604df0a3fbb259bf213ceb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Jul 2016 13:40:47 +0200 Subject: [PATCH 105/126] google-fonts: Turn into a fixed-output derivation Also remove the executable bit from some fonts, and don't build on Hydra because this package is huge. --- pkgs/data/fonts/google-fonts/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index e4c655877c8..0e41cd4e6b7 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -12,15 +12,22 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir -p $out/share/fonts/truetype - find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \; + dest=$out/share/fonts/truetype + mkdir -p $dest + find . -name "*.ttf" -exec cp -v {} $dest \; + chmod -x $dest/*.ttf ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0q03gg0sh2mljlbmhamnxz28d13znh9dzca84p554s7pwg6z4wca"; + meta = with stdenv.lib; { homepage = https://www.google.com/fontsl; description = "Font files available from Google Font"; license = with licenses; [ asl20 ofl ufl ]; platforms = platforms.all; + hydraPlatforms = []; maintainers = with maintainers; [ manveru ]; }; } From 024cb9eecd1f25dad64622ce1e59299059d5019c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 Jul 2016 11:54:34 +0200 Subject: [PATCH 106/126] gnutls: Disable parallel building This can fail randomly with CC systemkey.o In file included from systemkey.c:47:0: systemkey-args.h:1:1: error: unterminated comment /* -*- buffer-read-only: t -*- vi: set ro: which is presumably caused by a race with the generation step above: autogen systemkey-args.def http://hydra.nixos.org/build/37878764#tabs-buildsteps --- pkgs/development/libraries/gnutls/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 9866dd9fd3a..10047888423 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -36,8 +36,9 @@ stdenv.mkDerivation { # Build of the Guile bindings is not parallel-safe. See # - # for the actual fix. - enableParallelBuilding = !guileBindings; + # for the actual fix. Also an apparent race in the generation of + # systemkey-args.h. + enableParallelBuilding = false; buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] ++ lib.optional doCheck nettools From 13fc6e56fe8012936710a0475e2fd833acc3d3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 20 Jul 2016 12:33:06 +0200 Subject: [PATCH 107/126] Adding intel-gpu-tools to xorg. --- pkgs/servers/x11/xorg/default.nix | 11 +++++++++++ pkgs/servers/x11/xorg/extra.list | 1 + pkgs/servers/x11/xorg/overrides.nix | 4 ++++ pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 32303dac386..63e628bf29e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -611,6 +611,17 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; + intelgputools = (mkDerivation "intelgputools" { + name = "intel-gpu-tools-1.15"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/intel-gpu-tools-1.15.tar.bz2; + sha256 = "1gb22hvj4gdjj92iqbwcp44kf2znk2l1fvbcrr4sm4i65l8mdwnw"; + }; + buildInputs = [pkgconfig dri2proto libdrm udev libpciaccess python libX11 libXext libXrandr libXv ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit dri2proto libdrm udev libpciaccess python libX11 libXext libXrandr libXv ;}; + kbproto = (mkDerivation "kbproto" { name = "kbproto-1.0.7"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 56a7b1f76a9..3129e090e6b 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -9,3 +9,4 @@ http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 mirror://xorg/individual/app/appres-1.0.4.tar.bz2 +mirror://xorg/individual/app/intel-gpu-tools-1.15.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 99964bd77c3..bc00df85bda 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -57,6 +57,10 @@ in tradcpp = if stdenv.isDarwin then args.tradcpp else null; }; + intelgputools = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ args.cairo args.libunwind ]; + }; + mkfontdir = attrs: attrs // { preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b5ad033eb2..47e02253c7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10573,7 +10573,8 @@ in inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook - autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; + autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman + cairo; inherit (darwin) apple_sdk cf-private libobjc; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; From c5222b9d550ff867d8922bf9b14c84d5996f84aa Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 20 Jul 2016 18:46:22 +0800 Subject: [PATCH 108/126] syncthing: 0.13.10 -> 0.14.0 (#17110) --- .../networking/syncthing/default.nix | 4 +- .../networking/syncthing013/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/syncthing013/default.nix diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index b6d318011aa..4529cf3bd78 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit, go }: stdenv.mkDerivation rec { - version = "0.13.10"; + version = "0.14.0"; name = "syncthing-${version}"; src = fetchgit { url = https://github.com/syncthing/syncthing; rev = "refs/tags/v${version}"; - sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; + sha256 = "15l3q3r6i3q95i474winswx4y149b5ic7xhpnj52s78fxd4va2q2"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix new file mode 100644 index 00000000000..b6d318011aa --- /dev/null +++ b/pkgs/applications/networking/syncthing013/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, go }: + +stdenv.mkDerivation rec { + version = "0.13.10"; + name = "syncthing-${version}"; + + src = fetchgit { + url = https://github.com/syncthing/syncthing; + rev = "refs/tags/v${version}"; + sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + mkdir -p src/github.com/syncthing + ln -s $(pwd) src/github.com/syncthing/syncthing + export GOPATH=$(pwd) + + # Syncthing's build.go script expects this working directory + cd src/github.com/syncthing/syncthing + + go run build.go -no-upgrade -version v${version} install all + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + meta = { + homepage = https://www.syncthing.net/; + description = "Open Source Continuous File Synchronization"; + license = stdenv.lib.licenses.mpl20; + maintainers = with stdenv.lib.maintainers; [pshendry]; + platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e02253c7e..f146cc92dcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14604,6 +14604,8 @@ in syncthing012 = callPackage ../applications/networking/syncthing012 { }; + syncthing013 = callPackage ../applications/networking/syncthing013 { }; + # linux only by now synergy = callPackage ../applications/misc/synergy { }; From ddfc4ba977f9a3a706e9bdcd573a10f6091220e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Jul 2016 12:49:40 +0200 Subject: [PATCH 109/126] haskell-Glob: fix LTS build --- .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 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 4131e33234b..ab8a091aabe 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -63,9 +63,6 @@ self: super: { nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; - # requires filepath >=1.1 && <1.4 - Glob = doJailbreak super.Glob; - # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; @@ -211,6 +208,8 @@ self: super: { semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); + Glob_0_7_9 = addBuildDepends super.Glob_0_7_9 (with self; [semigroups]); + Glob = addBuildDepends super.Glob (with self; [semigroups]); # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; From 8b1976c7f6fab47e4d2e00b4b5b210ddc3fcceaa Mon Sep 17 00:00:00 2001 From: Alexey Lebedeff Date: Wed, 20 Jul 2016 16:57:59 +0400 Subject: [PATCH 110/126] arduino: 1.0.6 -> 1.6.9 (#17060) Based on @brodul work at https://github.com/brodul/nixpkgs/tree/arduino-update Desktop file generation is from #13690 - Solved all download problems. Package/library lists are changing daily, so I've created my own snapshot of them. - Prepatch jssc .so inside jar - @brodul mentions that it can be copied into $HOME while running program. - Removed some unnecessary dependencies Tested it by uploading simple sketch to Arduino Uno. --- .../arduino/arduino-core/default.nix | 108 +++++++++++++----- .../arduino/arduino-core/downloads.nix | 92 +++++++++++++++ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 173 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/arduino/arduino-core/downloads.nix diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 37947c804b8..652a52600b2 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,57 +1,111 @@ -{ stdenv, fetchFromGitHub, jdk, jre, ant, coreutils, gnugrep, file, libusb +{ stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant +, libusb, libusb1, unzip, zlib, ncurses, readline , withGui ? false, gtk2 ? null }: assert withGui -> gtk2 != null; +let + externalDownloads = import ./downloads.nix {inherit fetchurl;}; + # Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand + patchelfInJars = + lib.optional (stdenv.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} + ++ lib.optional (stdenv.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} + ; + # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable + ncurses5 = ncurses.override { abiVersion = "5"; }; +in stdenv.mkDerivation rec { - - version = "1.0.6"; + version = "1.6.9"; name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = "${version}"; - sha256 = "0nr5b719qi03rcmx6swbhccv6kihxz3b8b6y46bc2j348rja5332"; + sha256 = "0ksd6mkcf41114n0h37q80y1bz3a2q3z8kg6m9i11c3wrj8n80np"; }; - buildInputs = [ jdk ant file ]; + buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline ]; + downloadSrcList = builtins.attrValues externalDownloads; + downloadDstList = builtins.attrNames externalDownloads; buildPhase = '' - cd ./core && ant - cd ../build && ant + # Copy pre-downloaded files to proper locations + download_src=($downloadSrcList) + download_dst=($downloadDstList) + while [[ "''${#download_src[@]}" -ne 0 ]]; do + file_src=''${download_src[0]} + file_dst=''${download_dst[0]} + mkdir -p $(dirname $file_dst) + download_src=(''${download_src[@]:1}) + download_dst=(''${download_dst[@]:1}) + cp -v $file_src $file_dst + done + + # Loop above creates library_index.json.gz, package_index.json.gz and package_index.json.sig in + # current directory. And now we can inject them into build process. + library_index_url=file://$(pwd)/library_index.json + package_index_url=file://$(pwd)/package_index.json + + cd ./arduino-core && ant + cd ../build && ant -Dlibrary_index_url=$library_index_url -Dpackage_index_url=$package_index_url cd .. ''; + # This will be patched into `arduino` wrapper script + # Java loads gtk dynamically, so we need to provide it using LD_LIBRARY_PATH + dynamicLibraryPath = lib.makeLibraryPath [gtk2]; + javaPath = lib.makeBinPath [jdk]; + + # Everything else will be patched into rpath + rpath = (lib.makeLibraryPath [zlib libusb libusb1 readline ncurses5 stdenv.cc.cc]); + installPhase = '' mkdir -p $out/share/arduino - cp -r ./build/linux/work/* "$out/share/arduino/" + cp -r ./build/linux/work/* "$out/share/arduino/" #*/ echo ${version} > $out/share/arduino/lib/version.txt ${stdenv.lib.optionalString withGui '' - mkdir -p "$out/bin" - sed -i -e "s|^java|${jdk}/bin/java|" "$out/share/arduino/arduino" - sed -i -e "s|^LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${gtk2}/lib:|" "$out/share/arduino/arduino" + mkdir -p $out/bin + substituteInPlace $out/share/arduino/arduino \ + --replace "JAVA=java" "JAVA=$javaPath/java" \ + --replace "LD_LIBRARY_PATH=" "LD_LIBRARY_PATH=$dynamicLibraryPath:" ln -sr "$out/share/arduino/arduino" "$out/bin/arduino" - ''} - # Fixup "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. - echo "running patchelf on prebuilt binaries:" - find "$out" | while read filepath; do - if file "$filepath" | grep -q "ELF.*executable"; then - # skip target firmware files - if echo "$filepath" | grep -q "\.elf$"; then - continue - fi - echo "setting interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) in $filepath" - patchelf --set-interpreter "$(cat "$NIX_CC"/nix-support/dynamic-linker)" "$filepath" - test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } - fi + cp -r build/shared/icons $out/share/arduino + mkdir -p $out/share/applications + cp build/linux/dist/desktop.template $out/share/applications/arduino.desktop + substituteInPlace $out/share/applications/arduino.desktop \ + --replace '' "$out/bin/arduino" \ + --replace '' "$out/share/arduino/icons/128x128/apps/arduino.png" + ''} + ''; + + # So we don't accidentally mess with firmware files + dontStrip = true; + dontPatchELF = true; + + preFixup = '' + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${rpath}:$out/lib $file || true done - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ libusb ]} \ - "$out/share/arduino/hardware/tools/avrdude" + ${lib.concatMapStringsSep "\n" + ({jar, file}: + '' + jar xvf $out/${jar} ${file} + patchelf --set-rpath $rpath ${file} + jar uvf $out/${jar} ${file} + rm -f ${file} + '' + ) + patchelfInJars} + + # avrdude_bin is linked against libtinfo.so.5 + mkdir $out/lib/ + ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5 ''; meta = with stdenv.lib; { @@ -60,5 +114,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ antono robberer bjornfor ]; - }; + }; } diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix new file mode 100644 index 00000000000..bb36ce750b4 --- /dev/null +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -0,0 +1,92 @@ +{fetchurl}: + +{ + # Following 3 files are snapshots of files that were downloaded from http://download.arduino.cc/ + # Because original URLs update daily. https://github.com/binarin/arduino-indexes also contains script + # for updating those snapshots. + "package_index.json.gz" = fetchurl { + url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/package_index.json.gz"; + sha256 = "11y16864bca6h5n03xbk8cw3v9b4xwvjz5mkirkcxslkkf7cx5yg"; + }; + "package_index.json.sig" = fetchurl { + url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/package_index.json.sig"; + sha256 = "14ky3qb81mvqswaw9g5cpg5jcjqx6knfm75mzx1si7fbx576amls"; + }; + "library_index.json.gz" = fetchurl { + url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/library_index.json.gz"; + sha256 = "19md4yf4m4wh9vnc3aj0gm3jak1qa591z5yhg0x8lsxx5hr2v85z"; + }; + + "build/shared/reference-1.6.6-3.zip" = fetchurl { + url = "http://downloads.arduino.cc/reference-1.6.6-3.zip"; + sha256 = "119nj1idz85l71fy6a6wwsx0mcd8y0ib1wy0l6j9kz88nkwvggy3"; + }; + "build/shared/Galileo_help_files-1.6.2.zip" = fetchurl { + url = "http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip"; + sha256 = "0qda0xml353sfhjmx9my4mlcyzbf531k40dcr1cnsa438xp2fw0w"; + }; + "build/shared/Edison_help_files-1.6.2.zip" = fetchurl { + url = "http://downloads.arduino.cc/Edison_help_files-1.6.2.zip"; + sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan"; + }; + "build/Firmata-2.5.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Firmata/archive/2.5.2.zip"; + sha256 = "1r75bxvpr17kwhpks9nxxpm5d5qbw0qnhygakv06whan9s0dc5cz"; + }; + "build/Bridge-1.6.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Bridge/archive/1.6.2.zip"; + sha256 = "10v557bsxasq8ya09m9157nlk50cbkb0wlzrm54cznzmwc0gx49a"; + }; + "build/Robot_Control-1.0.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip"; + sha256 = "1wdpz3ilnza3lfd5a628dryic46j72h4a89y8vp0qkbscvifcvdk"; + }; + "build/Robot_Motor-1.0.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip"; + sha256 = "0da21kfzy07kk2qnkprs3lj214fgkcjxlkk3hdp306jfv8ilmvy2"; + }; + "build/RobotIRremote-1.0.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2.zip"; + sha256 = "0wkya7dy4x0xyi7wn5aghmr1gj0d0wszd61pq18zgfdspz1gi6xn"; + }; + "build/SpacebrewYun-1.0.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.0.zip"; + sha256 = "1sklyp92m8i31rfb9b9iw0zvvab1zd7jdmg85fr908xn6k05qhmp"; + }; + "build/Temboo-1.1.5.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Temboo/archive/1.1.5.zip"; + sha256 = "1ak9b2wrd42n3ak7kcqwg28ianq01acsi5jv4cc031wr0kpq4507"; + }; + "build/Esplora-1.0.4.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip"; + sha256 = "1dflfrg38f0312nxn6wkkgq1ql4hx3y9kplalix6mkqmzwrdvna4"; + }; + "build/Mouse-1.0.1.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip"; + sha256 = "106jjqxzpf5lrs9akwvamqsblj5w2fb7vd0wafm9ihsikingiypr"; + }; + "build/Keyboard-1.0.1.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip"; + sha256 = "1spv73zhjbrb0vgpzjnh6wr3bddlbyzv78d21dbn8z2l0aqv2sac"; + }; + "build/libastylej-2.05.1-3.zip" = fetchurl { + url = "http://downloads.arduino.cc/libastylej-2.05.1-3.zip"; + sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6"; + }; + "build/liblistSerials-1.1.0.zip" = fetchurl { + url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.0.zip"; + sha256 = "12n3y9y3gfi7i3x6llbwvi59jram02v8yyilv2kd38dm7wrqpw16"; + }; + "build/arduino-builder-linux64-1.3.18.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.18.tar.bz2"; + sha256 = "0xbzcmvfa1h22dlvym8v4s68w4r1vdq8pj086sk1iwlkfiq0y4zq"; + }; + "build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "1k793qsv1jdc0m4i9k40l2k7blnarfzy2k3clndl2yirfk0zqm4h"; + }; + "build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "0xm4hfr4binny9f5affnmyrrq3lhrxr66s6ymplgfq9l72kwq9nq"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f146cc92dcc..de169bfdd14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -408,7 +408,6 @@ in arduino-core = callPackage ../development/arduino/arduino-core { jdk = jdk; - jre = jdk; withGui = false; }; From 61faa4415ebd4f8b4f8c42728d7939a5162f7702 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 20 Jul 2016 18:51:09 +0300 Subject: [PATCH 111/126] stdenv: ARM bootstrap: Update bootstrap tarballs to hydra-built ones Picked from the following cross-trunk evaluation: http://hydra.nixos.org/eval/1283982#tabs-inputs based on nixpkgs commit 33a1d8080b50bdbf0143f4513db2fb4fe3acbd2e. armv5tel job: http://hydra.nixos.org/build/37908177 armv6l job: http://hydra.nixos.org/build/37908176 armv7l job: http://hydra.nixos.org/build/37908175 --- pkgs/stdenv/linux/bootstrap/armv5tel.nix | 8 ++++---- pkgs/stdenv/linux/bootstrap/armv6l.nix | 8 ++++---- pkgs/stdenv/linux/bootstrap/armv7l.nix | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel.nix b/pkgs/stdenv/linux/bootstrap/armv5tel.nix index 41d3eacafa0..9781414895b 100644 --- a/pkgs/stdenv/linux/bootstrap/armv5tel.nix +++ b/pkgs/stdenv/linux/bootstrap/armv5tel.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap/armv5tel/busybox; - sha256 = "1jdwznkgbkmz0zy58idgrm6prpw8x8wis14dxkxwzbzk7g1l3a2x"; + url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/busybox; + sha256 = "03i90dwkly1j2a7i12qixkybjz2b24ixjrl7zsr17s1sv6m27zba"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap/armv5tel/bootstrap-tools.tar.xz; - sha256 = "10rjp7mv6cfh9n2wfifdlaak8wqcmcpmylhn8jn0430ap37qqhb0"; + url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/bootstrap-tools.tar.xz; + sha256 = "1sikiydjlbv8v35fgjvr5swgvj6bc83gmrbjrhpi0hyzyfcinxbn"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/armv6l.nix b/pkgs/stdenv/linux/bootstrap/armv6l.nix index 619f38cb761..76fe900b9ae 100644 --- a/pkgs/stdenv/linux/bootstrap/armv6l.nix +++ b/pkgs/stdenv/linux/bootstrap/armv6l.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap/armv6l/busybox; - sha256 = "12hij075qapim3jaqc8rb2rvjdradc4937i9mkfa27b6ly1injs0"; + url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/busybox; + sha256 = "1vl1nx7ccalp2w8d5ymj6i2vs0s9w80xvxpsxl2l24k5ibbspcy0"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap/armv6l/bootstrap-tools.tar.xz; - sha256 = "14irgvw2wl2ljqbmdislhw3nakmx6wmlm1xki26rk20q2ciic2il"; + url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/bootstrap-tools.tar.xz; + sha256 = "106f3r1ndl9h1cbxn44vwn3kkhgi8a937xx1v9n40zfx6dzzfv25"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/armv7l.nix b/pkgs/stdenv/linux/bootstrap/armv7l.nix index c336dcf82bd..91452d639c4 100644 --- a/pkgs/stdenv/linux/bootstrap/armv7l.nix +++ b/pkgs/stdenv/linux/bootstrap/armv7l.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap/armv7l/busybox; - sha256 = "1279nlh3x93fqpcxi98zycmn3jhly40pab63fwq41ygkna14vw6b"; + url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/busybox; + sha256 = "0kb439p37rzlascp6ldm4kwf5kwd6p3lv17c41zwj20wbv8sdilq"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap/armv7l/bootstrap-tools.tar.xz; - sha256 = "15sdnsk5dc3qz27p7c4iainziz8f3r7xpg69dpfwfdaq1drw6678"; + url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/bootstrap-tools.tar.xz; + sha256 = "0h75xbpkyzhvmjzhj9i598p0cq60py7v0b8lryrvcqw7qjlbgrsd"; }; } From 27e72d14afefbac0845e6526332078631e5c64f5 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Wed, 20 Jul 2016 17:57:31 +0200 Subject: [PATCH 112/126] add epub for nixpkgs manual ( #15575 ) (#17053) * add epub for nixpkgs manual ( #15575 ) * change epub filename (interpreted as title & author by some epub readers) --- doc/default.nix | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index 076703213e4..f4f467b1f5a 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,14 +1,14 @@ -with import ./.. { }; -with lib; let - sources = sourceFilesBySuffices ./. [".xml"]; + pkgs = import ./.. { }; + lib = pkgs.lib; + sources = lib.sourceFilesBySuffices ./. [".xml"]; sources-langs = ./languages-frameworks; in -stdenv.mkDerivation { +pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; - buildInputs = [ pandoc libxml2 libxslt ]; + buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ]; xsltFlags = '' --param section.autolabel 1 @@ -26,7 +26,7 @@ stdenv.mkDerivation { extraHeader = ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" ''; in '' { - pandoc '${inputFile}' -w docbook ${optionalString useChapters "--chapters"} \ + pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--chapters"} \ --smart \ | sed -e 's|||' \ @@ -65,25 +65,35 @@ stdenv.mkDerivation { outputFile = "languages-frameworks/r.xml"; } + '' - echo ${nixpkgsVersion} > .version + echo ${lib.nixpkgsVersion} > .version # validate against relaxng schema xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml - ${jing}/bin/jing ${docbook5}/xml/rng/docbook/docbook.rng manual-full.xml + ${pkgs.jing}/bin/jing ${pkgs.docbook5}/xml/rng/docbook/docbook.rng manual-full.xml dst=$out/share/doc/nixpkgs mkdir -p $dst xsltproc $xsltFlags --nonet --xinclude \ --output $dst/manual.html \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \ + ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \ ./manual.xml cp ${./style.css} $dst/style.css mkdir -p $dst/images/callouts - cp "${docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/ + cp "${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/ mkdir -p $out/nix-support echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products + + xsltproc $xsltFlags --nonet --xinclude \ + --output $dst/epub/ \ + ${pkgs.docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \ + ./manual.xml + + cp -r $dst/images $dst/epub/OEBPS + echo "application/epub+zip" > mimetype + zip -0Xq "$dst/Nixpkgs Contributors Guide - NixOS community.epub" mimetype + zip -Xr9D "$dst/Nixpkgs Contributors Guide - NixOS community.epub" $dst/epub/* ''; } From afcf3176ec9dcb3fe6d00c7161d592b52a04203c Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 21 Jul 2016 01:00:11 +0900 Subject: [PATCH 113/126] oraclejdk: 8u91, 8u92 -> 8u101, 8u102 (#17125) --- .../oraclejdk/{jdk8-linux.nix => jdk8cpu-linux.nix} | 6 +++--- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/compilers/oraclejdk/{jdk8-linux.nix => jdk8cpu-linux.nix} (68%) diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix similarity index 68% rename from pkgs/development/compilers/oraclejdk/jdk8-linux.nix rename to pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 0a9792f2b4a..f1b27bdb54f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "91"; + patchVersion = "101"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0lndni81vfpz2l6zb8zsshaavk0483q5jc8yzj4fdjv6wnshbkay"; - sha256_x86_64 = "0lkm3fz1vdi69f34sysavvh3abx603j1frc9hxvr08pwvmm536vg"; + sha256_i686 = "0p9nvaifb1mn7scmprbcyv9a4lyqy8i0mf7rsb59cli30vpi44mi"; + sha256_x86_64 = "0a0kb3c7xfh81vx5sicw2frgxq0gyv5qp0d725rviwldlcxk4zs6"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index d6d783b8a30..b760ac7135a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "92"; + patchVersion = "102"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "095j2hh2xas05jajy4qdj9hxq3k460x4m12rcaxkaxw754imj0vj"; - sha256_x86_64 = "11wrqd3qbkhimbw9n4g9i0635pjhhnijwxyid7lvjv26kdgg58vr"; + sha256_i686 = "1bsypgf9va8jds0rlpnwp9n9p11hz77gqlmb0b0w2qwfmlmi227d"; + sha256_x86_64 = "1dq4kqi8k2k11sc28fnbp6cmncfj86jv57iy1gkap94i0fyf1yvw"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5683c1add21..bb98625fc40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4806,7 +4806,7 @@ in oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk; }); oraclejdk8psu_distro = installjdk: pluginSupport: assert supportsJDK; From 760da3e3f39b43c113797456dcdbe8ad6cfb466c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 21 Jul 2016 00:55:36 +0200 Subject: [PATCH 114/126] nixos: init programs.xonsh --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/xonsh.nix | 62 ++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 nixos/modules/programs/xonsh.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 70963991986..22daf532db9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -84,6 +84,7 @@ ./programs/venus.nix ./programs/wvdial.nix ./programs/xfs_quota.nix + ./programs/xonsh.nix ./programs/zsh/zsh.nix ./rename.nix ./security/acme.nix diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix new file mode 100644 index 00000000000..c0be2d8884b --- /dev/null +++ b/nixos/modules/programs/xonsh.nix @@ -0,0 +1,62 @@ +# This module defines global configuration for the xonsh. + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfge = config.environment; + + cfg = config.programs.xonsh; + +in + +{ + + options = { + + programs.xonsh = { + + enable = mkOption { + default = false; + description = '' + Whether to configure xnosh as an interactive shell. + ''; + type = types.bool; + }; + + package = mkOption { + type = types.package; + example = literalExample "pkgs.xonsh.override { configFile = \"/path/to/xonshrc\"; }"; + description = '' + xonsh package to use. + ''; + }; + + config = mkOption { + default = ""; + description = "Control file to customize your shell behavior."; + type = types.lines; + }; + + }; + + }; + + config = mkIf cfg.enable { + + environment.etc."xonshrc".text = cfg.config; + + environment.systemPackages = [ pkgs.xonsh ]; + + environment.shells = + [ "/run/current-system/sw/bin/xonsh" + "/var/run/current-system/sw/bin/xonsh" + "${pkgs.xonsh}/bin/xonsh" + ]; + + }; + +} + From 0558ae3057a39bcc808387532403608e806a8497 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 21 Jul 2016 00:56:38 +0200 Subject: [PATCH 115/126] firefox-bin: libpulseaudio.dev is needed otherwise firefox doesn't start --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 88d9a0ccb96..865af0a5abf 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { nss pango libheimdal - libpulseaudio + libpulseaudio.dev systemd ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc From f5dca01b5087da0c43a3ca1b928f666241c1ae7d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 21 Jul 2016 00:59:56 +0200 Subject: [PATCH 116/126] firefox-bin: 48.0b7 -> 48.0b9 --- .../browsers/firefox-bin/beta_sources.nix | 366 +++++++++--------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 19f130bcdc6..6748b0a9517 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "48.0b7"; + version = "48.0b9"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ach/firefox-48.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "9fa8e2fe59c149abf5b1f4fad168717aa68c9e3e9acb219aaf257aff953a719c2df1dfd55081c6c4398732c9bb16690e4481b7c3c9f1fc9ba20468ca38d7b9fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ach/firefox-48.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "b4115232ee0cfa6062fb9c06743d31edc444f9e5481b84cae4c1ec275c55500a16fe7478ee79caa269b669e566701be225c45729946ca950a492b36038d208fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/af/firefox-48.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "03dde31a027765e7003c89188cfdbd87f57447c8d7f6542e11e01ac4242866f6db98943d8d50188b1e0c41d740f3ee95b5f9ead01e9df5ad9beeb066c0b1e54b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/af/firefox-48.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "e9973af0cc52e2126ea682067fd7aa11bf071ae2aafab935d704122480a46658139043a29df30c038af85c1fde836ff7725bed21ea4c4778e176adbab704c6ed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/an/firefox-48.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "1e23956adc055188e4342cfaa0e38d062bcacaf0fb99895fd2fe3535f4e528890a75a18e0620e881e1fc87d11ce8b21c280c88ed11b2444d037990a11fb8e9af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/an/firefox-48.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "e75ea9a5ca4860f228d4b2aba3c9ba4d104a7cc24fa138102d80b595e29a391d15fb82d749ff7a03193dccfccc7bbd106dfbffe5ae7152afc4b62f4d05d58ad2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ar/firefox-48.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "df97f1f2414d9f2c1d5ddc50e901167fe3535ac0f71ef99e08552ff9a5f4b7e6162f258c41d1024e2f886969e7ae80b741c271b551a51ae05a48a3e7987a52b3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ar/firefox-48.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "79da3baef8806966891b803137f2b9610b3562f0a806ab2fe3234f3320cb0efe11ff523373e933d5d230a6959ca68ab013d64dded47e6043e9fee90202c8bbc7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/as/firefox-48.0b7.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "ab18bd3f015cddf2dfe337556d29a20576dda5879a56242955476f50b0978808d3ec63812666ce73a58904a70edf251e3773ea34a38b955510ad331e5f66751a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/as/firefox-48.0b7.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "26be5b409c5e4acd6a09482d1380f902cbc9948fce33ff5e33c22a8573b5ccd05f10a4b6f84dae8ed9280f5b6568a411837ec7bd1b64bfaf18670e2a45c475cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ast/firefox-48.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "30d23a4012caa6faa02871be312ebf867321b5cddf1e74d7680e426af4a6670b34aa48f237ac8801c696d0cd2551f90ab5fe482b4a9bd03bd7d4521e204bba65"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ast/firefox-48.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "cb0ff48d6cefe69c4f05a83d7b9247b5bccc31db8efa708a7de3ffa67459f8427ac255bb6645e59f7ff6047f0370d24d2668954837aed7d71eae88df6824cced"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/az/firefox-48.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "00685bee899c7a083fbe2a4dbdbe32df1f291c619e1ca681164a3c88782f6898a11add06a17f13aeb912c635d0fb2ea2c30c0e3bd5ff7cceb63b1134901ecab8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/az/firefox-48.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "e4133e1a9fb103652037caf21bc18815d89bf5e1a0d7b34abe115715e8e5060de8b00d35326bd3cfb9d5edb7cbe286456748953742e4cb5d5c76c7314a344720"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/be/firefox-48.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "9444970e5cc3f3359b02b8bc58f13edfd64ae6f99d306ae7d9baa084658c75b85120354614fe2655b600e0005de1b128df1e2967f93dd0fd1c31ee721e0ac306"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/be/firefox-48.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "08bf09e7b8f8911e42f5e88852f705c1f7263d1b6a0981c07f7ff651e620bd31c1a6baebd8a8a9353e49f9ed50d1c0d55bb88c97faaade0d415cba482ddc6f73"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/bg/firefox-48.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "1708e547f2ea234537a0dcf40163ac18c641bb4860e74f054325db8ddf4960ee0649348b458a8fad1f5bfbe1fa4308c9fb13d84fb941c2928ea42f6ea77cccff"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/bg/firefox-48.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "26540e48ce864590cc40a45d4124250674a1977778d3251b5f46701d3fa3b0f6d8a602b5bbe1449040ff943a2ed12bce7758037fe8ab753d0b43eb815e905ffb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/bn-BD/firefox-48.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "6e37580672455a717be37061c4d3135e72cd6aacaceef20957cafe9fc95ff40a6781dd92a8425e4023f75f4d027c5961d7a3b0b6373501790ec5057da519baec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/bn-BD/firefox-48.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "1498ed777a7e3aec18945ab01aec80a51e7cf6a202ca38b333ed6aa9517170bf9ec4a3c9e638acb60cac5b01ca16963b41489cdf71cf40655cd87d2ef161d4ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/bn-IN/firefox-48.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "1d9335e8b1268fc163bc31d1afe58613738f08e4ca8a429da63e59e4b862e326cd62d82a686e5710304a5b86e9d2981885ce52aca9913d4cbbcd4c1e0a88e782"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/bn-IN/firefox-48.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "e686e0a9f8d5078d2a728add3085d0d11fcec9ce8b1a05f242769532ede411f41d8385b2199e2a27edbe8a58648d3e4b91df2d730e6bb17b7cb69c4a22630fb6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/br/firefox-48.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "19f012125431f7c56ecf9ac12bb44a52aa041a97a0b2c1db3656d6229b4215d5bf492730c2bf08244e38ff120ad9003d4ee0842f834cfef8536b8f40d8e2217d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/br/firefox-48.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "250c9dc52e661c91163ece0fc195ed29d621508ab5666ae97d74ffeabd0dac1effddcc4d0ad9573c5c44ba9aa746330b5a6dd40693491f52609b1c47e9fe97a0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/bs/firefox-48.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "fa946cf9eba376ddccae25b44c31cb41dec16c016c678c155d0fb6f235c2932fc59eac0df292940acceaa7f463979495de17c86863450a1a771a277440d2033d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/bs/firefox-48.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "eaf3e8c8706a6005f6f78645c709cfa2463e47f678baa395db6c562506b872d9d110e973186b4408022cb1d4a8b343d7c84e2e0f1a3c18e3d5c04b72c23243b4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ca/firefox-48.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "c4fefe7ea67edda4cf5ff7dccf6639246fb73eae683ef72bb7c75e25d630cea78fad38d11d690d9786e43e506cff548df3c867fe91d7570048759933f2ec0523"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ca/firefox-48.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "9bcad65fcbfdc85892fc552809da740fd28094bf6be32ddf783a6d011c901f3a17d8ba8d33649111978cfd75274641f6e0aa3513b2d05ed100f2d2d9a8cf9057"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/cak/firefox-48.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "430b4f156d4130d2a689349c172c40c635ebb4e41d8dff65f7e3971b92ce7682661de763a1ccd706c9fcd11d3590d53193502c01964b703a7a304313c94e710b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/cak/firefox-48.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "46f3fd5a750618f8bfbc8015748e12df62b1f3db470abd3e7b0edba01ffe4dae1909cdbda5dd5cdd78a0d62845eebaf8e6223cc11e4b88b3710e1ce62e3ebd39"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/cs/firefox-48.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "d8b8eed71db048dbcd25f116e70040d5105dc3ea9ea69a77064807862f19229cc215ef1482c94609276b914ed7fe55250889b986ac1d11ed086e4de3bb15b9b3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/cs/firefox-48.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "01e23193ad0bb1c0cd218bf22e301fa79da810ec79f4d68afdbb6d7f3da5871de3f15f38abb5cb5440fe29a3781600dce4733fef67d0410ffc6e63b0c29fb9e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/cy/firefox-48.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "451f4eaae757e9474e905135caa2718d75551f2893a6343256b8c8595dd312e0c5416a7d7488b6670cd361db81d44097fb3c54c3cfa27a7efe6386652addb472"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/cy/firefox-48.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "c260f1090ffe09cc714ade4105c74bf234ab03f032cb066cecbc0308866c33169c9b3c7b37f3acd70d17794878d9e7e9f928a29c5e8aa2172d8475ca7460fb15"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/da/firefox-48.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "a449772de22183399c34d91b2c747253e7e32bd388e37b6f7194d68b87faf74df805886bc75230b19766ffb40e312c76d439754902b6d3c8b2057a654e656f33"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/da/firefox-48.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "990bf989ce48afd5261c7a6d6a4e3ada0c40acaaa5cc8c369724ff7eb73f5800009ea2c4584e8afe926f77d4b18af95510558bd99ff564754625e1c1dfe0d5ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/de/firefox-48.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5c6cc3a65a31043ba0143d9609ad006b6cb4f9af4cbc57efb4d2012ec08438b63045dca06c93b7d9c657f7cab9e19e01ed2b5dc78b79f2d9f59ff85836a89009"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/de/firefox-48.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "1dcee925aa75eb0acdf3e21a0578dc7f747dbef8cecfe5024dba66461e03420ce9a9211b2c69a35861cdc75facb956f576cfe3664f91f4085aba1585d976fccd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/dsb/firefox-48.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "c327582db0a1f78b1d4ec56115220c4bd5751eb46d16f26bd589b4b64291a66845d0277c4eb099cf197225771414ad1bd16a56d41587befd3fa1c766095c697d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/dsb/firefox-48.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "eb049a000e908e5d46726d09ad8a219e1c60ff2f29959f5cfa416a788e5c747f50ff5e6b807fe30f7e013a7f5587f607834ff0faad6e060a33db55d04dc6cfb4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/el/firefox-48.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "634320e4103b0ce72a6c132afc8e33ff4a234669f835a23e526c227e94f62be62075cb69d6883831d72d13d309d4e1ecf9947d850c8079efe0c880f7b7b79aed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/el/firefox-48.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "85c4a47f5d3c65a6ee623f89420141f0cf7e02d8c7338d39c8c672cb0aae2364afd37c66fa740bbfb88c52aa37da6b9d106a824845c881e4de6c2d2604477d47"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/en-GB/firefox-48.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "1ea0aafb65140f9c09aa4557d7460cfa9f206bd963137ec72a86d237be9cc3ca131b616c198e330d6328f48ae713cd5ac9f53159477b131e55e3ceef8e2ed7b9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/en-GB/firefox-48.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "1a726088d2843ce835154675c6dca3e877af6281bac63aada1e4969782350e985428971b216e9225646c8daf523907394a21080e7f4e40225b9ff62d24df4295"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/en-US/firefox-48.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ded034cd43b45d73539a3c3f8a196f26d5e80c3cba84e3d2ccb925815b661b4c9a3eaad1d35bc363ecee70e3ccec953bb03795c6fad33debd1a81ce8dc71669c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/en-US/firefox-48.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "0bdb77bee7fb8720f1154ffa486a8f6564ca592c56ce07b823800bd54218bc01c57bc27cddc73524c8f8fa1944c869523880a02fc698e44c5c71f4c800dd7208"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/en-ZA/firefox-48.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "9557d2b57e09c390cd706673c6b2203f2a1beec8952a63e2d891d00b975c67ba3b5f0f6da622e81572d090aecee42ea8ff398df61845f7564ddfd42818bdaf4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/en-ZA/firefox-48.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "0617a7b1117fe47bec89b86f89248cef981812a2126e64779d2f7b9c81fc11b38cb3ffe8f039aec72d4904cbb95505519e7ce64c115c1613e96adf90ee72f5d3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/eo/firefox-48.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "3e4ffa7728382e6862f224be0f576953120b563e0b68599df545ffb46483ae470d12280556a97b238aba0427651be744e9e93e7ba19be3d0764698367b4ab5ac"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/eo/firefox-48.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "acf8527148b42e9ed50d027dd9c9a6de11975d40556b2ceb27bbb2fbe0e37a4f2839ca643972b55de52f95619eb432e16b12f0cfb501a5be3824e977315ef89d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/es-AR/firefox-48.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "ed70d0cf72acbcac71e0684ef755d987702412103bab21510daa7107b369186569e848586009fb3e654f54ca657e7cb259ad5574d5ca1e16c517100946135466"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/es-AR/firefox-48.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "541f5579e3889413b6cfb1be40f5630ab401b7b0b3054cef1a633d89e36b59b1d83c86e44ccbb3acc8fbb13f2851b16e0b43f9aece4f98b0713b377606e742af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/es-CL/firefox-48.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "a44839ac7686b1d252cb04fe17ef5c2790d30214e5fa34a3cbd11f12dfbd9168acf7b33ef9dc22a06edd624726511e718691a973c5b70665eff78d0a18287413"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/es-CL/firefox-48.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "84b768876fcbd95dd1f9734368c73b51b82ff445df975bfe913eb74c139e35d069acb1428b9afc51357c4567dba0d03950d7199b3fb43017df4987aa69247450"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/es-ES/firefox-48.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "727f670438db45203d403746b7396b3b754b888b4a1d104b2bd0599790ef12b0a16db9a32b51617ea05bdff4f2ac696566970e83029e7e3d25434ddda8c4e88f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/es-ES/firefox-48.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "638ebd73556eacf0f2b38ef2d71db5922299d10c0d5b72b6bc7e935d814e300c17dd835f94517b8d0e62ba6e54d5bf5059dcaf57eb03a03bb7068161440f7c22"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/es-MX/firefox-48.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "da88b8c3d5c9aeb33cbd637b00f4790225b7b46f4b8a1edfc6c49edeb1e29929c4690bd66de0afd31492b213a67eb617355adfe5a7d7b5ded09208eb3a861e36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/es-MX/firefox-48.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "0581028fea7610b44f27a6e5b25203020768d87e83e665aca24e753bbc0f0d49e2935c8f12755e6d4911e5f79052b4362447d1dfdc37838bfe9976e0d218e49e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/et/firefox-48.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "6d150372dff1113d14cb32003fcbbfc11f9aff6ed8a0fc8f5f8e2d5d3119b34a8471469d69e8fe48161297e69f95185c414680b3c59bb95d7e483ab2805b5729"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/et/firefox-48.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "72d784c90c054d29420582a9a71d96c9a7270b1ac5592d8b920f8148542f17181d9cd71d019c0294c60112dde94191a686ad105993d7bd8340142ca849b5c150"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/eu/firefox-48.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "0c2b1f0f886436c8d9fe6eead6718ee47e72fd988e1e4d83a70200f6d085419636058d6767a66d273842cb44573d39f58f72181ddfce01ca60f392c6c18df22c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/eu/firefox-48.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "7c03846d49cf1dba85202b2f7b6ed722898da5185a956ffde1c88df454560eb682ee562f782c3e21bf62b41ab156048ba1c63efacf7fd46f8fd7adf0536cff5d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/fa/firefox-48.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "3a21d3ecb88827de7094aa4ccf29005ffbf3f88681c459aa9f159d6dd6b04affda08661b1b77986b73a19de1fd2fdba2ceb91036ecc718a69cc5cb16e8c8bbe9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/fa/firefox-48.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "4750663d5eae7ba9fa282b0dd97e05cbcf3ace8b0715983525ae207de57d352b45495e0dcc46381979997532a8e20c85567a9de18056181f5d408d57cefddaa4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ff/firefox-48.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "e9f452656328e3c5a2dd7dde23b84ae535551bcba16b14cc58fbf8aa33f2eb8655cb4ff524a15b0a2db2d4af9ef5da4ca853fedb5c0d05b877fb0a8656833311"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ff/firefox-48.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "f43daeec8c0647a8ee984d3541172516d1d8822596ab66a1a9651cd31d447a35f078725f1eb4b30a3f01c02b8573fb0ad268ada70ce013cf1932602f22119e4e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/fi/firefox-48.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "477e5594a9821864db879ebf04b74852c711c5f0a43e00c02bf17754817c20279c56705aa3e3b51bccd52f9380bc242b12bf58cf40a2b64d9697c8ea76270771"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/fi/firefox-48.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "aeef4b397c9972c055392faf64947d16173a903c290e4d710067c5cbe6c422acb2172f17c8b72bd5b80ae883f4d22c905ca0581c11822975a42031f2621852b3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/fr/firefox-48.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "363bd189e7988393a97c7fd9544537068cb541e762427115bde4a3f05297302a30604a5e6a34c97b037c8f2e9c25ddcdee0ebbd8c292ba007362b6de858643c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/fr/firefox-48.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "4da717be716a1c16440be76d988ed2ac2ff73bf5a8734d1025ff190cb6d3b9072bd613d973e65207102e4e54479c32e8101aef59de533487b60a1cf10e7ed9ae"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/fy-NL/firefox-48.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "49e343a363afb94a8b7f7d2aca557127af4743a97678d123fe2a4355d542497da1f5c43a9c83ec974586ca707c3988d416c9e55090c9bae10923bc5aae785bd9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/fy-NL/firefox-48.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1c53d25d464e36d7dcdda0ba6dbe5bfc85c03309dd22edc916c97aac4ef7f4bdf6329349fe66d27e1e885b7ad76359e27c6fa885302905e6c6e785da1535b53e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ga-IE/firefox-48.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "bfa9b70d5b2c891a82b92ad78e5f7b71df005ec142a1fe60e6bbc5717152f1b5325499fa5baca6a9f4e01be104b0dcddc11994a510e7cb41a5f1709dbe00c895"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ga-IE/firefox-48.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "3d6bc3254bcffeda6260168bc43e58e1ea517543831579892b784cb43f51d9cf0b598f6acf1b56f51b72b7946f1904eb96168f046a80a76923ba52f265ef6d12"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/gd/firefox-48.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "4c12d70a50e8d1b5bb2a912f3d070b30783757ea339eefa87e63c46f8e47646e69acaf975f3a565dff67bb65933bcf070bb823c195a5df9ba8968ac9a7fd82ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/gd/firefox-48.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "fdb748f6914902308d074262d4a1816d8a0a26a3e7f159d013d321875297b7c46eb266473361567c92c5011234ddc66a89f0a88b7ec6435c39e7488167d0b63c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/gl/firefox-48.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e450407c27de08ed93b088222fda97daea6cd69ec93a75f267ec67a510f3ea6a657eb4eed67844990f8815be28fa1af8fd722f208c3b6193fba38188eb03b134"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/gl/firefox-48.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "be63e8e8dc2daa586fccfcf4e41979cc6746ab2797962a86b6644c9ed14d0f228a0a83aeea7ca115e4a13f33bd5048075ceff9c0ee7516ba1fc50dcece31d88d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/gn/firefox-48.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "545a5c29789b626e47db56d0b962989f8a73244d865ef03bbff57272f463706cc5de1cc5e346b0188d4dbd7caa3fb67f6c0ea6064320d6c81a7db678b8eac86c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/gn/firefox-48.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "4dff9aad6938c17f3b97b1901831cdf1f993f0c8c03c3d03881680e1a5d82a10c414f85d5d6ef8791ea5c352eeede94036075b8a14046b87b19caf6cb917f950"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/gu-IN/firefox-48.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "a63a9c54fd2e3db1c161d33b6c725711bbe43d5e915f6bfe50ebe9f667a47299989e9096ac8b8caf80c7f69f0fb276fce33873dc77b930d0cc228d0472ae81af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/gu-IN/firefox-48.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "a9dd610aefc900d712bc68075d32ebe0e87a1de05af9b8592533db8cb65a1a6f56db5a566cd3c013a84d72802eac917fafd42517c0ce53b4701f58711ef0b7d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/he/firefox-48.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "5b0b46f00e3c61ea8c00b849b5605357979c7ec4276f9f490b6e75efee28fd4ba2aa285ebf689bacf58a40f03c2336e77a7b19c7fb518f95d900150c3c70d62e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/he/firefox-48.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "d67ef81f2c539718ff6916349f9ecfff42983c2e28b02b64e8ac71c54ef2dbfe5e9a4da6ec6f1b4361e458940bfde6f4da7f22bc19515cbdb98cc0166bdb1c27"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hi-IN/firefox-48.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "a15ac725626fdc4f9bfe02e31da4385af32c57c407dce7dc321e259fb29d4c46a254bd484dce8ea7d3e322fcdeef07d62f64a874d45f0460bd2b17007f688b71"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hi-IN/firefox-48.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2ded18a44554ddfe73721a35af71b77c600b362dce138ee78a633fa8d4d91a5fd55921654ff9c2eae05d0ebd9ede1de8b5c9bc07f761e068339474bb8622732e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hr/firefox-48.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "797fa8e8ea628b9855f42bc3f77e1928743f9b96566ce886cf2897dbed920a6f83089f518bd07f5f820374e0968de848b46d8a6777d8c77ca581a1b172fd25c1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hr/firefox-48.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "623eb40846a769825300177ffcde2f18721474605e6bbf7cacc0f26f2d7e3e68f0699a173fd0154bdbc6f56c13befe2bf45caa76dd3de7ba2249cb153b8624f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hsb/firefox-48.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "58b1f83e123fbd32ca6d824aa87e0834d92f8c148db086fba5414519aa77a1469f5010077b119dd6758bf58165afdc1bcb0fe5b0b664a68fb73951047082ec07"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hsb/firefox-48.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "853b6fa276e7e6c1ba0a30b95f8fde73e4bd4fb7e745c3722fed9de00bdae0d1739b78570a0108d2ff9efb73e8052e5d5192151ae789c5b336946039ece560d0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hu/firefox-48.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "984d3ab191091e9956bd28a2112715d0c27a24e5345b9c515e2b0521030200d2742041340db0d916915c87071c70b3d60762ca278dbffb88ab35611f30337468"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hu/firefox-48.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "cae180b050bd956bca474b187648dc969c2ca8ca3816ebe46d379681bbd470029d93e6518e7fe6170864c2466e6b3752aa3f372df34b672f93687704a26f0b83"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/hy-AM/firefox-48.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "f26993353fab3bbae965b7d7cdef57bee60839e4a726c75c966ff2e99cf6edd3e249bb3e3adc7791b1095869fe6f5b43861337f8cc6d3017600e61fe436497a8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/hy-AM/firefox-48.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "b7c228256d16587720f186c1a257cd157d8302e597dfa6cb72fd984c05105cfbe6e33578addce044a88ae11b11e4e6703aea432d5823526caffb08e81b1b300d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/id/firefox-48.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "324de4444814ec0e57c57fc4ca07dca20e10bb0a80df33ee01dcb8908caf6e5310563bfd66b62ea4eb5f595ed81edd9c504a8b6f81317bf85c4acdf9da2181af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/id/firefox-48.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "8b199bf64955d23fdbf47c92c57022e7742dce10c02242cd3cecfb662303402dce4a6c784c141a63007f4ea92b78e0ea0fa74fb6bddf157a848b2e85f50acde9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/is/firefox-48.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "4addbf9e9626f6f81a276e506b5974232da161e108c194ea34f755efa40e5f5b4df6e4feedc90309740b4e8c04b946a8da74cebc28867f2d23ca71d9c0dc4cf0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/is/firefox-48.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "843bcdaf5855dba929b4e12ba88388e3dbe3372051a3d789ac5951a66ff4c044af563e2c04e005788bf087590444d390ccdc0646ed37571e95cfa5225976cd36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/it/firefox-48.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "e637a52c2d365835de33b8e3f3dae7beac254169ac65671282252c3ce33816c3af3cd696c73d15a3f3a3827c72376245ead9b0f655d2bdc857156bab353ddf69"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/it/firefox-48.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "f62acc4a2d2e8fee43f3744e3adf6b2850de9b7ada59a9d985b5ea0051a2f00c2fb0ce14bffefe679c0359897e1920e071aacd177bc140719f47d64dccf799c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ja/firefox-48.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "081aa992d79d9a07e82a3027294752fc338e715e0b26edd6dfbb80fad3fab78fc4c0ab5082cf8880912c3a3249d7d35b0ae99c2152bb87a025219e7ecf16f330"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ja/firefox-48.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "3ffd093818c2fadc5d6e6a3ad9891b84352d522686ff1c23a9574c981a2421974d6346284db686a382193078ef3ad4ea8eaa081d9ecf59e4d07c396e1a1b223a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/kk/firefox-48.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "492e2165c88e5e2a1fcce1bfc2c994f7daddc1ded69d6b486f21d0655c6ccf112b1202080cc989bed68a1c35502c078025135af13ddcb0548b17d6f830c09b66"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/kk/firefox-48.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "f5e7a56849dd1aafc13b3b0772fdb482cf6e283ad98cbf2aa655c016d443242d9b760cf133c130813f04cc572de3f5ccf5cd4beeac98d07cdd4d9441838b1f34"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/km/firefox-48.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "d21d401e1505bdea1dda8fcd65622547ff919e0fe2c3ef402c1a5a67a5c61d6c082730ae21286def66699a994f0196202ba03956e9f5ba42a166d8dbff2a1aa6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/km/firefox-48.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "c0e08b44b09c3f8c0e17335c0d287285e3f6cd5e308688da36647ba226ecb10c98f87f92ca6b2d50e0718e39757bcace7132390ffc4d2a339db5d3cfbc37b85b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/kn/firefox-48.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "71d3dbd2fffbf51c64fe7af008e27a2d9ff3dba3417bd9c0f1106fcfd445f88c2865ba03799b8fbbb00c13242c1cc7995b5aeed3d20c19b95448a7597378023d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/kn/firefox-48.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "dda7d698c760ef750575f5978599bb964cc008a18ec048e744aecd17cf41d6eb2b9a69ea13efedf5a5d5a46da990c1df817027b7762cd169ca2f30a0920ebf98"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ko/firefox-48.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "f427847b0a4d3e8c52f59a75e4b1971ae96998d202b44ed360f5781775d3cb1c705923a4acb96a365925fa1f27af7e7292d3e4f0af6c22af9803600d7a64a9ee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ko/firefox-48.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "fda5463fb43253a392616ea7f0e287464e83bc9f4c9b3a88ae40f0e2bb1b18b5873ebe7304d27b76b2016312d9a2ff416f3006f5a75f315e2be5f8ea16be82a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/lij/firefox-48.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "38d539b3b0ad87b557aa9c75212c64978fe1397c797247d94ac6b2fec33723d6d05de80f1d79b84989424fe5074204eda4af3f23d163dbcfcd035e5f7f568ce8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/lij/firefox-48.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "a03e8261420d0b336545bf140916fea9cdf6cf2ba5bb55de6f039141011bccec49e88fddf7664e7a574c6da525f2f6646793b9d505135a311710a4d4014fde5d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/lt/firefox-48.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "ca11b61ed252863b6efcdab2438fca21bf837f29bcc7b719e5a99065aedb8f75bcae8beaec1a273624ea3c2a7a57db4386f52096777755297183691498f33c62"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/lt/firefox-48.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "7d6af8577ce9c9e3ab13ee3313b4c35bdbeef802bb5a5a15fd991d4fcf063b49ea1292718a4d74ed57b7c6f00889c96c9261bba442476d6aa090623afccebd9b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/lv/firefox-48.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "19024158acd59afccdbe39430e463e9b441cf1950aadc713ff8a74d9da97cc11d9437d86d0542306a8fa4a29a69547b4d59aa28be2bbec8a434425f20ca0d1dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/lv/firefox-48.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "73c81902a047a13c01fddc07eeab9886c0c55e2a3ebd30fee0a036878e52580f50c47a1dd4050cf39587b63432cc9c2947c88200fb2c95b143379a21ea60c400"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/mai/firefox-48.0b7.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "d6a2d0b8821872b4f78f2fc9ec6ab9e602673bfff2d1b6339a37532f883b61134719d0e4e9caba53d3198107b895b3ce193839de2a374391c3fd58e595be1eca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/mai/firefox-48.0b7.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "bdb1e2e97b736b70a7d11538e3fc16be55889b14397709094c2efea1faa3c57b0c272cacca0fb0b307a3cba656145df3f7945cba4e9f762f3f9ee4f389e3ab50"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/mk/firefox-48.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "0c52c93a00e1b82b5569787a624806f1c3175d40813da3da0833b23006cb377dd1b693120f96c1a6c172093393ad08321efc52262c5260e80fe037e709c94ae4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/mk/firefox-48.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "bc2c513eb37a667195180ba3933407c7f90cb1e815f2c646a5410fb942e562c3659eaf3200ec6397a12987267ea26be1c71dd4467f80045c79bb793f2144cd89"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ml/firefox-48.0b7.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "7336e98002f71f6ff9b51d94b5c2ca2b5ff412d9069837053a63e3819013b36ad6587b9675089243f19474eda2906767e98b2cb3e96ace266ea29f5142c2533d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ml/firefox-48.0b7.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "fe70de56fa9d3bf56d355058c4412427f967f69467dd7b49cd1fa26c6abc898ae061b49bf259eaba7073fd926c1e8e5901a0979a88007ef3ba3d5caf07329203"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/mr/firefox-48.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "180072a70d38d4607b8c2105dbfae2647900796208f6f5a6111419c4712e6ea959a6f5ca5068f1f7653ece073087e2f3c5dff177d92da4d92aba4ac1b4b7971e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/mr/firefox-48.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "08bd093d657ae4e6b6136d1627ebd355ea2794c2e2824ca4d4121a5a506b0682a65e1416aa2cab49fd00db4c3736ce09101225b0333385032a958309cd7e4edb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ms/firefox-48.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "a3bdac7effbb5a29f2ff1385da3de4a2c16a914d1d3306cee22b379779b1eb9d45f6a6c6bf10ef1e1a11ab52834a08c5510a38303c10cc6e4cfb96b32ce2769a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ms/firefox-48.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "08f2fe47c14ff5432f8944312e3d45d26dd3fa56bf4b0d350b4504cdc639eab147e3da9edc25b8551ab5156dc214101831c2c1c0f1b159201e5a061461e51285"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/nb-NO/firefox-48.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "cfbb14897df334df5f11305ec44f8e4b736a8320b6ed39e5581be413cc4daf92908ed54215e24e35e34e0904a1a500f295ebe64871e53438658d0340f7e708ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/nb-NO/firefox-48.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "19403a121e9e86447f3265ef72bda4e3a7fca55dfa76e8a25381ff97412329705f8b8a79031fd0116ac7e0fdc29fb9afa0c1de14287399f28e95d181fc933470"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/nl/firefox-48.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "73789e769bcf2bd710f5234cc9c0f046abd5aed5d66b4e900b19f87a3c23a7daccfd086d9fb80fc6ced3742ccec90e96aba785330a2dc9cc79d76780fdf56cf3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/nl/firefox-48.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "07a842dbcde5fa7c5623fe5e8bd8dec04b33b300f52a1ffa8fe604ddf93df9879b9179bf8363cca4aa62a1c878ed77fb5e0b5db85355b4a2d1405888a9a6268d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/nn-NO/firefox-48.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "b82f14f66dee3036dd62d0af2889137d51521ff51494584fd8f50f380e8ead3d8290a73843a0aaa7dfc7e38c3f69c28b661185841c3f71f11eec686336c7f36b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/nn-NO/firefox-48.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "9b627e063644d138c5b9b5bfce48431f8926fb3b13caa01547aebf007a002c75f8ae3818d5643f212c2e6d1e6203c49a24412aaadcc2dc5539824c168ecea52e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/or/firefox-48.0b7.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "7e36e94c90cd2ce6116a56a5f1ae2772eabfb19bfbe0a5bb616173f0e3cfc6d9f3cf77db07c767fe2673b29437ea8cdd70584e2b65752660d6c4878d598e0998"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/or/firefox-48.0b7.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "cfb9989b2ff2e2a81c3453dc7b03113e251d57b1925ba1fe60bcff4bca9fa16fe8ce6409cda6f90d7afde832b370a731d86c999df08e77a7c69ad6e72181f6e8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/pa-IN/firefox-48.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "63e4f8e6e5d6360914073a1a8b9dfd9d1936ad3efef6994a880bde075468cd37809294d3cd80dbb693b429dd82426e06632b6ea87f776da509bfb1ed1cdc1848"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/pa-IN/firefox-48.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "49a065634297b37532882cad5b13687fb6abfe0fdb577a4ea1bf86568abe2ef5b29bec7d786a47b8a12ad06d4fa78faffdea1f531245488efc42b14da24d2f52"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/pl/firefox-48.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "06ff4df2f58d8c39ded84915d5f4ea2137f1692b7955c205a738fe65adc8c324c9e4e1f46963e40dfb74c483a33028d6157609e9f99819683008e0e5f992e52e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/pl/firefox-48.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "b07fc75e55b860ac8ce03262dfbe77ec558842baef037f0e390245f3bffab03df31f6488811b630ed5355878dc01e4930b839251fa726a121fcbfac2eddae9d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/pt-BR/firefox-48.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "56a5f63dda3c359203a1ada88dda971aefd4219e0d76a8123792131cc5abaf23a1bda2498c1f93725b853576f572205905f3b7d16569611adcf87b7bc96528b2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/pt-BR/firefox-48.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "5f7af50fa1620c17e4473c869fa0a4384518b79514108317c1aa8c5f32fe6635bf88eb53d589f4714fcae740988d56163e293960b40b2165eeb6fdc7146586c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/pt-PT/firefox-48.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "b3f4913abae949f1783cb6cfe934b97f3a93a579c8f57d3e29d87e15169234b58c5a243395ddd0944edf4519a9d3d735424bf14ff7280d7a54494989cbe7aed9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/pt-PT/firefox-48.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "71853f84f9f1545a099bee0994bc598845aceabf562730c1fbb7b0f9c3ea8113e6ba473840feadf76aa0d35ac0ae5a038188ef6078fdb192de99396973cfebce"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/rm/firefox-48.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "d1aef184253166dcab16b1cf25bf58131ec76e30af84ea0a75d89106e253ae4b5ec17d55039b1d1584f39c4ee1ef7eb28b73144cb8312fe15aba74e43cea0ae4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/rm/firefox-48.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "1ebe23f6c352e088180ebc9f03c4e35b1c08a2c8b9efc64ef710c8bb0c70c082bcdc3f23c436a427a95bccc219a5be8011b46d49047483fb57a2be2ea61577a1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ro/firefox-48.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "6ae17fafcc61dcf5ea548e55c7535ac196402c20468ed53eb32a529eb756a88264660dc4acaf1f27dfeb9bf4e5515c75287b4cc8ac42c765358908659ee12d03"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ro/firefox-48.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "9635df3cf66825a4ec30ca03f944929977bd526146d5991b03a2539e59a6d5a979f8d25697e9aa6e051ebd6f05bbfeb993e11e547491a272e77c36b695402d93"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ru/firefox-48.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "ca1f6e5e32da878f50b2cfa5f42d78ed93423e0f4f308e914a184747c59a82f0d2db5c768fb65a16bb0409070614be44ea14351c21904e32baf5470b81fd4925"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ru/firefox-48.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "14f66c3db5d3f17e064eeb80eec31ea4d531b827248eaa5d6d1c936962b77503f7b9adb16daf754909e4749f8548f4be8f86f3d01345bf9999e70d8e7c52f6d6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/si/firefox-48.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "cd45ccd8f3e41ae3f4833f6f5a821dee061898fba61c974099361eb84272676b146896727889f8adecdd563db9c4ce0de666221eacc7f0ef841ce4a5155961d9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/si/firefox-48.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "234fe0d5677b67bf5458df4290b055159860f43a3afa66982b9ed9279a5e74ba90ef6cde23fdbd9fb7134ef0ba47b270880b3561f35fdf2286b23e128f9d0da0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sk/firefox-48.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "0cdc7209cbb2d537ba19ba206b53534f18ec0cfba1ad67a435f7134b1161f13236db2bce707cad50687790861e09ddd31a35eec8fd4965d4b1c697a84b4e00f4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sk/firefox-48.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8db988c2fe8624d9b7154a39df173f2bec70369edebcb02363f5a1ff50e299590722961d58c96bc7cd003e14b7db8e6c1c78a488bd1bf3721e880df1e14fed08"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sl/firefox-48.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "a67d0bb63da12db2a1d936b40dfbda4f4473a67c8937c771b8b07c651eb9302128cdce01c02f1bf52ea641dcd9520b5d79561c07a88004ab39ae4ddf28a6cfc0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sl/firefox-48.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "d0f179237a4dfc59d8e847f5393ce7d59c6f399bc9bf5113f70f3850e3452d14542f08ac1b2faf0ec291b0f80183553d4b44c64866902db4ee891f00703bfe4b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/son/firefox-48.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "f66d6383be284933b2b62432b86e6ffa636c737ff5ad2d8159dab527cd951501eedcbe9a41d197fc1a7f14404ead4b2f25b7c1bd1725bef80a5dcba6a793ea42"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/son/firefox-48.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "bf461c7cf0f24cc091af8806097b759a5ceb5934fd96011e003a438ea5de0dd9221241665c3b713dbb3485f13070cd7aecc23902a28b2f84bb6bcd69d96b95d6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sq/firefox-48.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "cac1528dbddbf0163391cbc7860cd048376de7012950fdb74beb8f0dbecdbfda5b41dc347d100b0a83b31d3b324211e7a253dfbfafbc72f083013250660139c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sq/firefox-48.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "bc96183968912b8ccd6e46adf82c49777f19b1692a5a06ccc9e24d4cba31fbddca79993f6e33a1693da0a794c081d8696d96dfe84de32003f190c2cceb484e9e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sr/firefox-48.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "4f5ae88197d4841cb38da7b0b8c5cc0ac8a228f6d1f6851bfa8782dc4ae91124da25a2235a13f9074d29498ff227602bafeb2a475e1f83f116ae6df26a575f66"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sr/firefox-48.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "334695dbd86e2fe674897b23c9144444e984e16c5cb813a980fbc6b025b214aaf344019dddb8612125c26ab1b6da4b9007dcffc1ddf205cbf226d43f536728ce"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/sv-SE/firefox-48.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "9bb2a9d07db3f7840e56368edbdaa3760abb2a5e9a266f75ac84ddafe0ab42b582613cce581dd898761ecb869b85ec515a113a79ee1c3470ae48ba261f559c8b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/sv-SE/firefox-48.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "3a7dbf64988527a3d1f88fa1840bdf8292cf90ce21b5823aedeb2fb9263a2b7ffd9f89d2709e2a2d208f0c7e70d3819a92c7859cc2c2510a4f0fe8160599d3b4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/ta/firefox-48.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "4d6df0bc1dfbb8a0761250fa7bcc3575af66ea0e91e6ed18d340eac96e4ae2c50e1f873c54f10eecc08a0902f3dcb9a9df753d6d9f6a640e7421fa9bf38f884e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/ta/firefox-48.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "b13dc2570f7c2f5d4a323aabf1448d04550d6356bd43b143c10fdc7e88a97d79d93b8145c3d7230e9f417a147f5884af3217738e5190955ab61459703bfe5954"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/te/firefox-48.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "b3540cdfe33168c6b77386d3d32dd3a44c3198e9669fac89129549f6240475e657c2e790a38f985e85e20315df0769fdee57c65513c914ebee239f51e7932043"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/te/firefox-48.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "3aa1ea89e62fa74208c5336c99aa6bdd98358852a032e1c90a70a48b6903523d08cc03e62976e10bfae86cfe0b431befd9a33bd62ef1f262d58bd9d5940255fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/th/firefox-48.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "8e2e979f54bef8979367b7bc5b54eafbcf774dd4ec47a65352e8529d76edb6a4ea331fa8dafe82894868f4cd6b269424f06668a46596d099400a980694b03db3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/th/firefox-48.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "708841b24ad871cef003040a59379dac33b2131bb699ede2146d02b6be7f562057c6713d050e201075341dbbb8a7fb400c6852cb4d1de2064fcd03ecdda6450f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/tr/firefox-48.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "788e91d5af695acfdca1b02eb422efc8ea35652dadffd3b03babe5622c6e8d0ad1dd200a63589329a28eed3e0ca723e838ceafa721c45a86ffcc34aabc462671"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/tr/firefox-48.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "370fc35b68ec734e9f5544f7cb74cb07d706f3e1c181f25c7e1b6e5fe1f9ee1bd9b289e164792e4a31c9fe7fb098c5114919234cda0583794f8964f14d60c4f3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/uk/firefox-48.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "463da060477f0b9831fce5e00248d841fa7b9ccae1e70fd707966aa09f55b7bd4eb89ee04b41ed6619ce465c86ce84236fafe14268a2b97c482830a2c6f8f77e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/uk/firefox-48.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "7a085f96ad6f67092f11ac1605541f1dd39a5ded50a3375e50596e18c76e992a1ec9a648a2ffcf4fefee09a3644d6d5d0abcbb43f5173a1d086f3c38b4ed7ed3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/uz/firefox-48.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "e3458b936fa06aab7ad5fb37c8bb0e3d1391e764382643b9978ded9e175dbe14fd3658f9b0903a0a5a74bb1aa1d56340fef37f19ca9ed92d3ba3ed28174c2cd2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/uz/firefox-48.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "2899fc4bd5b40996aebd0c67627ddd40bd9c3778001afc23a7d4a232a12ababf4504568594aab045eddf2a1ad71e026bbc832b5ddd265132c74325eb84523a82"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/vi/firefox-48.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "c8cbd21b1ec2962e30a525bf7d1f45f449aa80448f3c8cedf2ffd54b2f7e1e07d8f0ceb2c5fdb3a9bd7e2df8fae0b14c65d0d84fd60f6cece8ececec7df468a1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/vi/firefox-48.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "86fd5cf184aa8b897b37dc0f05bdce5dba64e7b8d7d6fea79d42e7a591a141af7b28e87e15a1a98d828ed259c097005b8ff8f52fa5c33873eed199d5f2a391b3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/xh/firefox-48.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "703a39b4d0fbb522c9b7a2c24780776d804025b659a6bfc1b875924429f05d55f2eb57bc333dfc6b0b0b18bf8b18dabdb7a91ec7696cdefb404cbf0b2afd89b7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/xh/firefox-48.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "0551330c8203a93db60f5c4570a03fbd7b63f243eabe2eb0465bb8e3fa6c2389e402b29237fd91f98455f74360c6056d31fc1c1f66c5035c57ff4c8b2500070f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/zh-CN/firefox-48.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "8b9293827007bd0d510ab84e15553f4f396dc058a9871651d63638936fa03cb628ffd31bc2d01dfeee9935ad18976e0941345217e1e161df0ddc7a0e4b527ae6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/zh-CN/firefox-48.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "ecdb91365c00090388b0d0e0b9bf7fc327b6d142c3671fa96e626a744852ee838220efcbcdc57a6fe2f17d8b3a3b57fc3644b30d965a0a5c118cab421755dd05"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-i686/zh-TW/firefox-48.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "9f65780b2952210ba613767fb885dd77af3e96596e2d7833902318ac7508c98172abb2a42d3c33c7bdb63826379f039ee50f0df3436c122a4bc794d4e9fd3a20"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b7/linux-x86_64/zh-TW/firefox-48.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "a915d396e093f2d87f2ee6cfe20f3c26fb6c524968fee0c8d1cbbf1e53a6cdec86921b6e2f252ca3a8dc13bbc8617e97d8d6e883973364e68be70c409bf1b8ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ach/firefox-48.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "0738019c7078daa1beb31445d12718dce195719279cf430c13526907aaa04328efd043b77eaf641674ed4eff8033e8ac47139858a9c9e194bf6ccaaf8cd54d8a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ach/firefox-48.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "9700cfff54bdd3404b75d7690863ace89aacc49db3339b2ee11807b1ea88f3744d610800d6e5d5144cf7ff8f292374e297779581d629700c9570eab116b5b449"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/af/firefox-48.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8700996788a438bb6cf7a5bc0aae166e621a2b32cbe06dd91589bf0abecf123ba34ef9fe7800395d5a8fb148f50a68e35bfc97ddb4b51f2318e87dfb92023798"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/af/firefox-48.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "b6ff01541e51fd287783750011ec5d5ea1a731c28d4c807d75fedcb6780afbda76b19a4bcb7bbec305cbcbaaa84dd3f57a0b41c404f374022b4ea1e850b9c6d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/an/firefox-48.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "11710dcf2c470bac75eaa9a3fca7aa3508d4e9c9b59d2a39f03d166d25c05ba8bcfeda4c4a95134dce8d7c4d261dceb980e1a53a9a11869b7d8b226983f6cadd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/an/firefox-48.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "7723e02a752d30c597ef7b295b2c1644de4e2a6d02b364853f9a9c419a2d172bb5338792a5a9403851bb3952e93dc092e12056782df1017bfb3c39a2550ccd70"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ar/firefox-48.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "90bb7327e77e048784efaed6afda9c35eabe4c238194acbb14543f7841c052153fb5f0f7ef202564f2f749aaddf7e870b9b850022b0570cc96d34f730bd1ff52"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ar/firefox-48.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "410b9d0db9038b597129ea423752300e1831d69c6768bfb09eed3c20a26b1bcf2d67ace6f8befa8a47ab2441ebe69d34361571609709586c3a1086259d9864f5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/as/firefox-48.0b9.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "b50989125c6982cf8d9c97af09e9734046d2d3eb8e0e220b139a8835e76cd39195ab2fe2fbded7461acf6d153a8b5376b4991f0c72322f8a22e9961d17589072"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/as/firefox-48.0b9.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "873830760fcf310d26dd40f7147a8c7ad252828ede05a03b82e6d7ccb021435af1d5f7fc61bea6a968ea0f24e54cf108e5f6fd4b3e0558163bcda00cb3fe9aa5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ast/firefox-48.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "ab6f0c4efc8ab7c6db6a4b31d6dfc93aeff8d65e1fce60d8bc9ce6f86e391f0cd5f6be1a3e4f8784c73d5f982a66e33a69b40614ff4eed04416bfcdab5362e86"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ast/firefox-48.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "f66b0c006d530dbfd4df30400dd6b15728a7fbd023e88d745d0b8ae05bb63d0d33e344ae70d3105815aa9a23ea5419b80b853d68ef05b7ca2c24d31c670e23a4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/az/firefox-48.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "cd96e076df13db6cf82d8a6d13653bc928ebde446f4a283e949dd66229297c5a284392b118539c7628593c696eacf2de9b4b8ad623750ed909c08349b3263093"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/az/firefox-48.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "0c5311168bd7e73e7d81175aca2a46e10122b29b2c54a8b92bbd74ca7092dfb9c43709cd30c50a02c030382c021b1192fccd8e8694fe3c8c8d0cce6370d3bd93"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/be/firefox-48.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "07c7fac9790d83a06940efa3445212e592764bf794c0b3fb924a695129d0efb649e5cf68656d2160cdbcb188290fdebac971947d891d3eb31cc99e25126c3a55"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/be/firefox-48.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "789d5ff8f0ae19758b379508d72f7d8315026fdea898218d03108ed3e9d42b85f4fd58649af5783a484a4f5dedc282dacfa68cfcfc9be5154ae9d5a73ae3cde1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bg/firefox-48.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "9d8b4837ba7d03e2b5482333e945ac56ea0c715cd7db2a8126d1ad589df2cdabe9eb9ea6b4ac302b02976fcc319752f544090aff6f7569c5610977e6c24b350d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bg/firefox-48.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "244ba31c371c649e2f448a3593cb267e19837f011215283d73d1e672acf4c32df1b5c11aaec722170c26b2eef7b7bafea49ffebedfd52ef1a6ebc9fba5650210"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bn-BD/firefox-48.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "eb50c9a1f867a1e89424511f1b6152a3633f77271997e33d819a194bc3b85024d76aacdc1d877d6ba72299678a7b5dabb7a3c3f3c37cd309bc73b6514374e683"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bn-BD/firefox-48.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "780c482fa5b809b7220fd672c7c24c1e2d764ffb8b13b431663385cb6651da17f26c32fcc60e978ecd971b45076a3fbf8675243c26d5e178b326b84d3b9a0b32"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bn-IN/firefox-48.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "5d4936b8beb2db435aa89308492a3ffdcddf4ac60bf32a100bc0943f648a4ca624709d4b171f802df4780ef74bf9d2ba3029fe3aa9e5a6d498fd44642db36f9c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bn-IN/firefox-48.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "d9c4089a87289815b4af7e3ad91fdeea76359d941c5a14a9c9e3289c47127b3a3f5a72d522679ae1fadc547cf65d448c604ae3687e11fcfdd73c5c48a104dfda"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/br/firefox-48.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "134890cbf087ad9b97d532fa10b5b6b0738236d6d1b27b402b1b1832d0982fd9e53f398f28fbf285cc432c5cfc6f83caf9f42c39e351ec188d77c43fbd3fdeab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/br/firefox-48.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "d19af5f724f6ce509c05f9005b1e3576061244e6653d8069da9aa6ef8fae3dded66e8138dd806babf9bf7a3e8c7c14de999a28368f26190e747c67af5f29e81d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bs/firefox-48.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "f0d29df4df68482cc74da7b2b7c6a2658b3ecaee51d259a1aacc1dd1b30aec7fee7a54696ba2f859608bacb23ff4e0cbba81353387e12b3567067034bef3905c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bs/firefox-48.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "bd98070a500f5c6621b4bb18910a1728d23aa193aaa0faa6cc68f35932b436d64441d1f95065f543263e6e6b0484d6c42b7fcc4462a63e594b56297df7713a1b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ca/firefox-48.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e7ea69142daf2981432237db537ad85760eb9ce1407e66a206cef39f99c6aa5cd067feca3626ccecfa2d1c67d3425b13bb88c6eb4cdb903cdb12de04b3904bf8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ca/firefox-48.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "7f30559ad0e456bdf6492561f1283f85fba3c715f43549d2da46d006a59146002b4fe2f06b50a5b34e94633cfde9aded6514a61b451257c19baff3ecff770299"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cak/firefox-48.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "289bc8d19ab40a435740e27e44eb637511f0458e8dc14d87851ceef7e2594b52ef621107efcd090e2a31d97be5c04dc5d185f9c10173c38a1974ad28def18f5a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cak/firefox-48.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "f1f7b43df14d70fd543402b62edf47e0e347b630282e0976f6bcd64e14fcbbf60f5526824a1355c7c493fba539eb42dc7dda760f3896b5893e72e84fabb39dca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cs/firefox-48.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "04c42f09f55ca4ba3a9f4618cf4d860927ca9c01b152ea4d9452c218e02c960fae75311f707091ab0633989c918feac0a50fd27310c09c0d3608b95e0bcd132b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cs/firefox-48.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "f4dbf9158adc508d494d03232a24a880ff6eee5b4d6a0aa74c1f3e9a52b7a4a573f579e870d0c57e3b9d17875a2cbe2848c2d7acb7b225ba1b2a860cfaf5dc85"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cy/firefox-48.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "7fc634a345f2cb8c1876eac09a40f71592531bcda3058f2d3f6d10f8544be2d6f88cc541960329aef91bdfda21140e181d095c2e656882250ae23f7713b8aa29"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cy/firefox-48.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "fc4f316b01ec48fec0a5726742521a735977705a7ae5c36e47f13c1b375663e3a2187fc3fb08400c6f89901315edf81cac79a0b90bbf42421f9305ea79509d95"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/da/firefox-48.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "00fda3e6357e98eece16090d6e6452d70d5bb3e4d253604f19c635d880f8a4967f5c6ddfa64db1e64e85ffd1c2b64473255ded8b6d547d277c2a37283e18b5ac"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/da/firefox-48.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "5971f31c81346a18ee5cf5a8dbff79c9348254a6f882a73f27a391a1136e2df7019744df76e8044c299b548163f2f75ba51bd67d0d3f77cf1dba38b449656c45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/de/firefox-48.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "1e02384a438f23571c23b471e75bd89717163014b326ee3568dec6e2c458c601e9f96b1ded21fb2b4f5611530a7c145c4bd2d124a7fb375768da4c0936989d19"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/de/firefox-48.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "f9b35ff0b69c3e48e3c77a0e79d332f7aa6d336e3840ecf377d614a16b7debb1cb288145671a0aeb03c04058aef4b5933e332b9b48cc0d82b3c12c4c2c00fb9e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/dsb/firefox-48.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "bf24a7a33bd83618953c42f79a2a9261d68048f52ab62e6cd030ddf1283802d7cb5df0fb26e9eb05bcd0e81dc61814ddfb0383a2172c741da9615a4a208cfa07"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/dsb/firefox-48.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "b6f8413df7ccf5a7a3a7cdaafacbddbd996a8496471f51b5bef62eeda9057e93ce1f7fa941f2a6670609ae0c711187530e95516ef0644253335080e25a66c0fc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/el/firefox-48.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f066a0d534e39581dddfefa8808850b1fc427c84f25c8582610d7db47c0c5a792c8cb516321fb3d91134dc0f3e76bbb26075b1d8030bd07eb14a77024c8afaec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/el/firefox-48.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "2a0125284f2dc4b402ce02344fc3f367834438ea37ee84b866fb0f6b69e8cb9afc0bd586ec43efe6c45c3a5bcb0c99d9a0ad273faea464048bdb5ed56f2b8577"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-GB/firefox-48.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "49be18428af54affc03efc0bb4aef87bf361224fddc735830a71a2f71dfd527af9f7593d90eec930e5edc3e7949172347e63ae78d75dd9916c97ca1ce3e3f92f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-GB/firefox-48.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "b1220f9977187408e1756fb27e26ab763ecb5edf6d497321ea4ba5fc2b32ec5c2caf3b2cb54fb3e506ad3b1a76c8b05c5b986fa6ca25e4ff335a083ba96802b3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-US/firefox-48.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "a91f9d2e04ebcd209bdf4db3638f0ca05287ff52023f6bc993a165d14bcf3264199bcd3559cfe1314e1e886094251c0bf86f274cf410bc456241c5d96fcfa255"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-US/firefox-48.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "e75c437b0cce3e06f9f91fd53cefbd4489d6d31ce93fd642b20e547e03f5a1f417d06ca4566453d1c5b7fad4dd1fac61bf58a414b982c3ae843891a8efef40e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-ZA/firefox-48.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "6a1d643add5c1b63633a02fdee766de6a73174c169a832b7f400e320ee7eb39cf74d652389b36957df200942877ba03dad714d2686d7dd7bad4a3993698e8630"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-ZA/firefox-48.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "877c2d4562fbda98c62902536f07e5ab474a78ab2c5a077bee440cb48525a6eb529e5042533061524cf6fa85b9f6b70fa91e6f2bfa718ca49fb4adc70ea92514"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/eo/firefox-48.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "d91d25252de09a1c8f52066a3d4bd9f8a6f479c9cfb52bdb7f3939d32162805a26c02b4e3a13e9463b318c2da47d83b77b23fd4bcad58657e8eac8f6f6a769a4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/eo/firefox-48.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1a697f4a9c98e956d78f41a22c4c0996542ed67d89b8cde095b330fb366c0ddcaa1403c016f2f2d11dae18564ca50a6f953fdeefe66ce8cd95c8d3ce99212555"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-AR/firefox-48.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "59067e78b573ceae232f11f5b507fafd5f0cb75ce19f9dbc05a30990247321a239157881202b7ae3676c4a6991473741f7bb4e3ccb799bb138f46a3497d1f38d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-AR/firefox-48.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "377410f25dd32fe268a07783bff69f4412a3418d9c9e852e6bd577914727c7e65642781e86a2bbde4085bc175a1ee034fd960d9bbba72463f0361d17bbd7ebee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-CL/firefox-48.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "5ae95c0e81ef1c23956b5324dab0690c237cc9e7f8b56a51870f668ef7091d8962a0633691909672b63e53bc436ca0c46705cdd393c07aa6f7023d2fb5600ff0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-CL/firefox-48.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "36ff8818adf938144923df82a7fdf9bea26d43225c0853c84a541233cccc370879e8fcca3750f162f880a879c0b41789f692cb08fabc9073d11e2e865d357ee7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-ES/firefox-48.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "0af5cceb948a6cb1be21f98a53e8733113c27339c50e5bb3ca21bb2a82d28821f7f92fcf71f31db156def398e8ce5bc7875d2cab2f231a3702b0c0e30990748e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-ES/firefox-48.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "1c0b8d5e458314f1895bd41d73886962813f9ce1ce099a7438202faf0e4e82a3fb9b701e0950cd5b668a1c0e5a051939868b774956f607c30de974eb7a06a710"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-MX/firefox-48.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "7ad31cf9470e416c6a8cd9a7c14aaeaa6998d9b20ab67387fa32e28490b3dee96ceeb6fbc20258e01d2264e2a96f7607a7a69d960c09a189b62bf638d211306c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-MX/firefox-48.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "8f757afbc6869351b561fae7b9773a8fe7009b3869ffa5e1776ce1b28c1786d6558f0e2bf8487e8a028e3377de39c461309aeb9565e3b03ed1ac6ec8934ce59b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/et/firefox-48.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "97acd2242d10184243a7d1390bc58326351d48877fbb70b16945278049f597e627cec7b55deb35337392787e29e46b1004d7e332e730ba020b17615ad2f9fd5e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/et/firefox-48.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "665878727ddbdc85b4d6757a566ebcc4ba9ae098312ea4aa8c63eb52642460365bd4c29dfff42f63561d9b2806d9d9dc26a32422caff56795af93ee78a838bd2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/eu/firefox-48.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "a6c7af099860209cdc98dd8929392cb71f8607723da9f53f99d9074948b6ec571998db536421d7a79e2e623484be00971380d866ef0962626ebdc45f5f3d535d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/eu/firefox-48.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "9ea439a7607e5ce736e9f5b22b507473dac5c6e710904b3d273ab2873f9254fc5999d570cd2bfbe2316bead8d1cf8bb6e7db021efc876c266741e7f1aa7f2443"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fa/firefox-48.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "7735a5436d28f6ea02d1083a4f97665b86d8795456002076513b236e336092cdba4cd1ca9505178bec87b8ceaadf78e236bb7185a49e662dc13f394f4e63afbe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fa/firefox-48.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "a335270482f4fa3a1ba27a865721047112edb960e433cfc315e5ba07dc3ff0e465f21b86ae15ceabefb7d92ff249e950a36e786b1312d84bee9c133213ee4a31"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ff/firefox-48.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "a6c3d4c2e493a7e48fb6ef6cddeccc359aa0d8b615beff078c7065df47c5215bf1c964aa885bec5867a1220bf5406c2b481c46ddfb7e01f121e4913af086deda"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ff/firefox-48.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "7f387391a8105972ca877818766048f2f0c100a1cbda0a2bde976c65cea63ee957100920d43a1b6cab4e7c103e5b4c048cd1293410cd32c7e47475aa7aae81ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fi/firefox-48.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "6ed696d1d4d7e04204ea943b15069de3ef19e8e57ea4f697c728aafb4f892f80d4b448137ffd4f7591f8342edbb6a1ad719bf7ca9d05960d72b22bf172ff7a6b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fi/firefox-48.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "92f16501746fc84132b7e5efa29efad4dea56c1596d1b589799b2f4a59321e344ef252e346be40fde915372b50f9106ca580bbcb16c19ff88c97079ab8954e07"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fr/firefox-48.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "3657fbdbb3543897047a119dfb218b5717be7d6ddcb31ea976761211e3186a8ef847f326d5a46bee376f326972f4b4cd213b877909ea5c97d05e1a81cd61fcf3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fr/firefox-48.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "afbad7884f15b0d9e3e61681bd62449b55a8b161c0ba5bd74beb50993d47068941535b49837509b9a645061b44aa17566e806b16b64a7a19bb5a4be327fe3600"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fy-NL/firefox-48.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "d78aca665ec2f7fcbf4380555df36bc0d4add5920ff4a3f4a1471776fe970d8d7b80b681c32859ac57a04c8f90732d240cb82d2d3dbaebfda62325bc65bafea8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fy-NL/firefox-48.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "86c3b0df4feab0e6acfc51e6c0b0d159d22e0ba285ae4d0f517c6fa6b36f3d14a73334ec0767dadc5c21afffb616ac055a72bd15c8972ae6a718f3a88b4a4b3a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ga-IE/firefox-48.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "368f2fff3afa7cde9f3bca2f3fa281dfd020919093204e6e4ae5d1a0b6af17e748ded0aed83d2646961b0140e21e97a978c24539a6a7e984f607bf330f77d1f0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ga-IE/firefox-48.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "7053373d6b96eb2dfb95cec2583a5b0b25f9b3076d03d85cd9e550d02f473f4b4ff3bd7196bca5ab69cf383fa92ee4be8fbe4fc47628b55938552c6d4762858c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gd/firefox-48.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "02a82abd833755a06afc0b245ee2ce503ec45133f929282225df84e3f9eb76dcec40351431ed099a601c63d12f36502471e27f58c8855c618598f7befc647d1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gd/firefox-48.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "dfdb2a4d0627f782c6054c4cbc529711e42b107b8fab4550c51443ab39b6f0496b206d238c14e292bcc9e5959480931bbea2647afe5b029e2a4bd255fe621a7a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gl/firefox-48.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "2a2c4d5f9df457560bd4084ec0641d4fb17f66e1e41ba73b12a2a467942b5a010fcc3895be12b187b2b1abaf912288efbb123b6aa914a0c2668f9d8e4160ebc7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gl/firefox-48.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "2dd595709f6a8715eb72d920e4f3a216bb3e7c64470c5e86883726e65918c42eeab75688b7ce8540c055f0151174ea117d345fdc28ac979f3bd49e94cb3bf88d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gn/firefox-48.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "fd9117544cb86ffba9661113e5f8e2eb12c782decffd8e66a7dfaa84da256bba5294e2dc9121985237a5c26abdd2f3005b5fdbc997161f3d0d8933c3133878d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gn/firefox-48.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "29fa2f47048a14260482ee98ac4083f94b86d669df4bc6fcea3614648c70274f4352f80d92421ccb22c34b00a40d05a6e8a39dff74bff1963803893555c44c54"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gu-IN/firefox-48.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "810626ef20f6bb6840fdab2c5bb943c210445396747cdc08cd7eba2d06dec43b9f8156d586e751d226569b51eca6f939f9a921b760887ea9a3e33ab6c9bf7dc4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gu-IN/firefox-48.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "ba0be48fc7f37260d28c9aba7058d5b846f2c4333fa738c6fca93c70c580fbd1e6659800bc2236e12f03b91f0eb83d061aa97332c5553e64cf36559dbed68428"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/he/firefox-48.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "9babddd78b2f479d965b3afd35f4f862ac1aa9508a40eead15bb2d8851773fc331a1f19a79abb032cb943d4cf396e09e43d1d19ada0cc99c7496ec95732d0998"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/he/firefox-48.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "27329d2fa27443d000bb09978e0938b4d3fa01113ecfaae31ef4fd07d15f4973edd025dfd5c9872689a5682f59195fcc93491275e604893902ef96ec04657784"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hi-IN/firefox-48.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "91f1482f99dcb8107e3332becf616004a157a3d2a0127682994c01590dfdca85c273e86a459ed68f09ea5688ead17c0f771850adb8d885dad7a8a303b63dad21"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hi-IN/firefox-48.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2c16c240315d20bf0a9f2d9231d1c7a72380ff1c66b7004d9dac6d84b8eaf665421e1a69e9d738bababefa1b7013ace385bbaec79dcf6c7f9bcb20a5484b8b3f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hr/firefox-48.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "fac7b7782a77874cdfaa33d5312ff4cbf768716b6ed17dc762568f1fbc69a9e4eae328b83bcae951b61f3513347a45dd922daf2679420a04385ef1f5260655e7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hr/firefox-48.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "edd07b7766d98933d9e4338336fcfc44ba1aeeeba867e1e8943dc30d2696c93c337287f45cc3cecc13e2920c6d4b31198393573600d828623b4b96973eac356b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hsb/firefox-48.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "67ff1af81011477dda69baacca4c48e0534e17804cd147bbae57e7e2427f32764bbad1eda06687602b39f3e14de3b455dd526de42bf21b9913c97876ca03e168"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hsb/firefox-48.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "676f7e8c0377ec0e4f6614395608d1f8e4458445820fe7ff60ebd191aa640020ab6c94284ac9260581ad32c3e733c6a407c7b92588ed90f7f9b687289a29f984"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hu/firefox-48.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "afe8bbbfb44bfdaf85f3700d2410d03e488a05727bbe81858317e3a6851d54e97d223ca76a3e10c374a0f7ebef93113cbf61b4fb208ddbfb438ca86fd6b26f6d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hu/firefox-48.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "efb13d909e84435d152886e6d6059a48fa64f9422e35429105c40605985de8769544c1005df2396d66c7336d8d04a7195dd95c3c29a74674c8c171040b66d19c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hy-AM/firefox-48.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "3e57e60bc13cc90768495d2edd1afc82526eed21045d22251f43d8c4e3688f5985de31d60e9da3222a34d1c0126e9a722311686011a70ecdb719a4b294e9e9fa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hy-AM/firefox-48.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "f9cf84a91d1b624163b5384051ca626800c51f486b2f1deb213cf7c62c7010e9b5b27c75420794c3d930ab126ce1c699851a279ee1f2f51d7ac939c57b0f0a31"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/id/firefox-48.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "047eb087640ab3bb89c3870cd8fdc50f33d393abeeec16e038c627f74743f61b9a14091aba858006e283b1d21cd51436267259185ea259657958395db99e71d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/id/firefox-48.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "1c8ec433c5b1fa936b299dcb53414e98e4a4d745151c2ea995c44d589e54fb159db2ddfdc380b317c343ede35ba88223c941db4e563a96a4a93878aef0ec7ba2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/is/firefox-48.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "2242c0e23d7ee69f5dc52203c6326caa194a3aa04a27701340334f5a9adb287ced4a5e8d42248cb43512ee3e2e4e94764b738af72b3c2fa45e20519ebff47225"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/is/firefox-48.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "ced9018f2409ff544f1f86cbdbaa516aa03bdebb9a2c96c8c6df3503e7be1677321c52710837309434548d4cbf6a6a23c5a79157462483537fba6d0aff1f3717"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/it/firefox-48.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "1fa74d050366c3175ded35f3879d14eadd81670d9abc28f4493171ab13fa87cf19667c2f40581b5029ac7391d2e21226d355d7c6d78c6f0d821867f86a67334c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/it/firefox-48.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "cc63233e9d9eeac428e999c509a7a9cb3d83a3d2b7b9ddfd8bff8841daf1e594a714f5540911616615babbc21f734295de8a5ac7f0a53dd4f62dbfab657e0133"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ja/firefox-48.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "4fef54eeabea6033078bd94d385a1fc96cd38d49eebccf2820710c5d516641e045be9a65f1ab0eab3eaf7f727adbfa98795671864b78288c04155d4516e064e3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ja/firefox-48.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "0c25eb277891702d418c62de31f6a0d7706ac783fc527070e6051456927154ad23d0bb3a085127426ba4d54017ce2a713ad95e47066fc2da0831a0a9f0ca29a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/kk/firefox-48.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b42f1a2115efc622c1efbe62de3b275ce01ec43f3ebe68f6cb591b12af4232a0c5262cee6ea61648f9fec2da8702b5f24f6df187afce020f333c519d32da18af"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/kk/firefox-48.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "2bba17f65a5b7d412c1e357886bce2fb4e017a5694f69930a7835429825dba86659e1caa31ab0ade9ae34dab0a507102d485c5fa44d9fd156d4ce4e3d4453976"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/km/firefox-48.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "36cdc77425f5b9d0546ccbe24027676fbb98616b226ecde4e610d9958a11c4645fd2741213820bf145bf258a0f32f65c81bf6ba365484949da673ca3a79a1b5e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/km/firefox-48.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "0ed475a08d580bb864fb1d8ba74e6ce2925591c008b479016faa048a642d2246830ef1a102381e553e5309c1b3d5885ef409befde2c1ef950c2483bde3de1ee9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/kn/firefox-48.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "4961da8a5f554895a642ea22bdeb640c289385a632a6de2b02154cdd10de8f7eaa9f3979f16bc026701f1986e1fcdfe2b67c0580eb30ef4e7c32a5c7b0a89744"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/kn/firefox-48.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "63d674029a8f43e21fc4eea4278e0944141d6b0425fc92855e84fb4859085ea15ddb7e06c229e4ea6262d42a91e8f2216de45d185e9507034f636b95d116c3dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ko/firefox-48.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "217af13c53e8e9edb43a7817a901bc51c5b013e9fd27f3aa3ec8ee46a820f23fdc558e73e5ca1e40829d0269a07f32d704f1a607d8cb36878338b8084d8463bc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ko/firefox-48.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "14c8c220ce753be62628f9a0ccc726bb2c04aa9fe8af72e412853445dd3a4e4e328ae5b641142c181df0949212805a20c381b4716b5d4ee97633707bf70baa95"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lij/firefox-48.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "e162cf0bc0545be09b6f7c8dc237c1f757d18fc2e81640b12ebf8e8bd396f9f58f5bdba875e5472d03f7596da9a0a9670f35a570241cbcbbe8ff8071861c6fce"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lij/firefox-48.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "c041bc122decc4ab427457a4c0e2807694d7cc9e44c4414e75f9b3cb09068167de0a98b1a1a876e4a36a1edc5a1efb9fc416b2676ecd25a80c0361833dcfdce2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lt/firefox-48.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "7d69e16806b8fc2eed1e9ef9e270693f4ca9beeced5f20e825ae6b65eecbee7538b9f7d29217a7c35043d221d0a4ecea3c6e0ae985431dc00c88133e7118ae83"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lt/firefox-48.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "6e2db9841264bcdf55f6f170935c3235178d4bf287399af80c953922bce1424b6260eeee57d2a80c5d090da14ea7d9ddbf36d96e27704a57c9064119d324378f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lv/firefox-48.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "0a56414f8c375a201ba730ec132546bf9db558b0491fa9201c977bcf8fe24d958d3f39bd845cde3d5cbe3427a8e4503663d1f63a8b49eb814757cd7b4160f5e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lv/firefox-48.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "adf934ca0002427735e77ec583882f81a8e7a905fb20c81eb30d25e4681a5e77738d361105906a7e538f61b967ddc4e44e61627bb1670cf7ffa92a0a25b170de"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mai/firefox-48.0b9.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "598c052561b618ee8ee16ca3d3db49e6102cfa998fef2e201d80980a2a24683347d1b335bab6f4914d262530e1d3aa0a31d06994b211a3d1fc92cda9b38485b5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mai/firefox-48.0b9.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "9aeb08929ec09da09d375c4fbe757d1e7d7fade2b9307fb27c880d8a3dfe1e73346a2128904ce5ec2824bb57c3bc9c533fcb445bbc4b0d5f7aec7f5bdd8beeb9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mk/firefox-48.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "75d8b7534adddcdb3354a36848023c2015ff9701c8a4abecea5d8699c77464d27e4a5411b38fcfc1590443d991044637f9c37c38d9745756e18e93e3a9df9630"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mk/firefox-48.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "10a82086b5e54b70d1110dba1be3dc98ec64ee4fd32ff9c73abf743ccabce37d586f63b46fbcf11913126f62be3c4caff6593ea276665632ada512e9119bae8e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ml/firefox-48.0b9.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f32e2a3e4c2c233840f6235c71fe70fad5afd0455cf3729cef3888fe3bc54a6d73d5fe32fb0363b693a39ba414be02d5107f62920f147712e36f48a6a339a96c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ml/firefox-48.0b9.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "c21851d483a9dff5ca1a5831c3438a9d6e25828e6bb6af415dc9943d665f0752536672a9bdf6d5a0d8bc9ece1193279aec2401d5fa982210aadc5cd4891a1093"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mr/firefox-48.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "42158c09eb37ec16ea1aadfe06c44a62eaa7be1bbaee5e7b13ff72aaf60e674a4b27d03054c6a7748b06cf02522fe54eef92e6ea016ca59ac0c6caba33ab7c99"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mr/firefox-48.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "00a6455c238f72f5112c8e2570e53c54c6b20c1dd12fef9613b700fe6ea9e0017ef97f88f028509575960ab28e485c2ea79cd06ebf03a7d262709892e1b0ee9b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ms/firefox-48.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "6a7c0e93a11417413099b557057ffcb495b8dd97aad0c0d95320c59508258721676230f0e10114aa59084c3e26eb48470931d0ce31c7697c17f3eab5480b6f93"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ms/firefox-48.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "6428319d01d1b31b84f6ecfb8ab3ade9f2ef5ce56fdcb4da1a6adfa89422c9c83099aab95b4884d1c336a88f429e05586f590e83da9d1bb07b5c7d1e4e81d4f5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nb-NO/firefox-48.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "b1edfc9d90f018b87e5d3ad6daae2d5aec0276f086020c7dbf199cfa120c1f6216627ca72c98a307d98fe82a0e4b57a703b0cdf7473604b09918b4dd3548a795"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nb-NO/firefox-48.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "8d17660df93e03c056cb96aec3a64528b3613c7173fb19957916d1f4271cb13defa59f4771fe0547ad72a5fbca5bcfa68855fb220e5f560ce6d185ff074156d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nl/firefox-48.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "2d881068bf9e8eace11e3d57c41ba99fc81f797e13a2ec05cca6acf884369a4bfd140027de2f7c79c6b7245e133c5261bb8e11f522debbd946154d0414b3226b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nl/firefox-48.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "1ee190a679c5575ccfc6d5decbe5bf2da55769c766d70400f79d94d4423dc594830f08b456a8a398e3e7a1cdd507dcc224c1b255fab56b4b4889c0f283bf0ff5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nn-NO/firefox-48.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "094533a700c763afc66cf417b0b09f8c2666143592afd0fabb138c03e95c94da4746b03c80d1b473fca94f24f57105239399a994cde961ded535cc5787bdc7d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nn-NO/firefox-48.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "98ab06a9210bfe63c0a7e90310286afcb24ce46b8096966a2adff608e214b95563421372a383814163dadaa4c9fe318a1c9f2f18537dcc37b1fc1eded227df6d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/or/firefox-48.0b9.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "6139c760019bd9932a5baebf599090540e4ccaf0e18b3faaec8eec27f8f5b6a2199c4a554c0d6d5c92ddba4c9fe24addba47becf69b296cce186be3c2ba3a5c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/or/firefox-48.0b9.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "503da59dbc9c7cbf5fb85198ea2cebe3a9d3ed5b6d0edeb2bc0e0a4705397816840f40d235ac63bc95e34c5aad7daf66ce31a3f6b43a8cee9720245269520bfa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pa-IN/firefox-48.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "af70115ad3fc5798f7add37bf342a291cf263afbedd1b57aaa68dddcd1d707953dde2e10c71b38f46c942e629e3edf8a2e55f502d1d98bb92a693cbc85e3ba73"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pa-IN/firefox-48.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "2f11b9bb6315843815beace2de30f5d054575806e98021144f3a622362fb484a0078cc279e1fd13a1b2b6fe9070c878eb718680a95ff9e4e5a5bac3ad31fc949"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pl/firefox-48.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "7fc676238c0a484e71fe165921bb2edff5f5f98d87a3a02111e4c9f4c103ea8b0c4454fc39d2be381410beec7e6bfbcf02eecad8555f61d424187dbb7e8117f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pl/firefox-48.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "cd27e4c532324f35756c3274ecfdbc47d42ff7a456e81363df4a96ee4067dcb0ef6dc321a884f9a19e0b0f25101e2e1caeeb62280ad1305c0eed1f8308997bba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pt-BR/firefox-48.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "70123bf8edd0ec031eac0f150bd8d7c12e52d5255841c074c8ace5d0062fe1e1beb336e27815b3321a93f2be2c7eb8c5b95b653781922562b625d37921f986df"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pt-BR/firefox-48.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "28c864f45774f4e56558e691220a03cbdbae07ad6c4cb12df51938a0e394b0aca91d64ea1d3b5efdf361c54510e4a14033c3c9b72f94315307b606516a9da5f5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pt-PT/firefox-48.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "b56bcf6c74c3d629c89bcd138e948fc768bccd8844f664100156399ed89c2715e75edfda1427f9205ba44bf7ae12d46308f6bd9bdd661aa27a2791a50860afc4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pt-PT/firefox-48.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "c71179e281f660787df540c9a894591ac22303a7cf600c649e96d8748753f1c8caf7a016c91a822b867ed5ff7467aa182583fd45d0e6445dd07eab58fa0799d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/rm/firefox-48.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "51693c87e2961b69db233d543c08b6c3fb02c04e7cfe70ecdc6e060fd1a32625e197db2042b0b063b0f5eb465191f87a41b5602424c44ef4dcd3131423ee3152"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/rm/firefox-48.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "48241427ee3d820da6a42b33660184f56ae1b9bce2d70515b26c8310503563c7a6fc7de3a15be3a366bfe697696ba9dfb19e08fdd31bfbda50abc42c248e1a70"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ro/firefox-48.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "f458cda0c659c8ce5af848e7a64942d89b9d844b5d8ad0d79d44decc0a537bd8893055bf9868e3c65e4b53ca4f01c0a90ed449f19726a9e1314cf4726f9a1bf9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ro/firefox-48.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "91656c40f1aeaaa1fd93abda711c4ef748a3bb7a357f7a4f469bcc3bd8e2a1ba52546beb51d894e0c167f168fb70d1b5dc382773c73c094221e3042bc9857bfa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ru/firefox-48.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "f384eadacf3cce571e594a02fa7af39f64889f5b8d02846162c6d359052ee0f9071e6df600800a5fd3f3fbed622fd34358dbbbc7e05357ecc12369bedfe8196a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ru/firefox-48.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "de52b810d65d048065a83ea430d93d75c4e21667d197aeadae9e036f75d16c9a25af5c4b2c2fd9bc9b3a7968355e9f6640e19996f6d3fc42aa2e1bc4ebb53afd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/si/firefox-48.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "a14807d1077ba5ee3ee258220768094f49002bf624e235e66943f2b7bd1f0eb61f84e3f540d0403276d664f0aadfb75d1cb433a1b364139c46cb48d6cfff75a2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/si/firefox-48.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "0d6161efd6fdf1837892b71ebe639d13751ebd880b06211a40076e98e9256f30099b9071611c25aed2c36fa255af7756e39a90d60103e22c3e2572dc3bd870a7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sk/firefox-48.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "d5f7b76b75afedd12cf1bcd52df49418f17e518dbde52c0b822f8e7e7aca55838f85b924433b8083876588209eb1ae8d148585d60408eb8ac06b3be38ea4faa7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sk/firefox-48.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "123bd1962ad26df9c72075ee360d715c5ba87bbf715f0f35841d2466e14a93fede982a33bf43c6593f5356fe2de1d11ae4ffb0d05d4506856bb9e3933cb33a9d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sl/firefox-48.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "343ebcc6207e8cf4b8e46df9371f9ba6b91f6d79a5fae675cefa5a80fca3d62e06557db6d0126aa68479450365dc1084327947fc061efc41b504d329a6d7ee78"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sl/firefox-48.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "3eb40d1c17d96bfb24d02dce3195107abd37673675bc04eeae71d7e8efb4e3ab70ba5ad466e890bd82d55e45cb34edb407e03676d03dd27f29c219666e6307ea"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/son/firefox-48.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "926bff8d0899b2720677c072bb24c7622eed59d548084f2863b844afd8244cf83753268f712aa2fb6cff360448e9ce4da4974f7f38417fd48ff0d3e48629db08"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/son/firefox-48.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "0fbe6e0edf8bbf3039b0ea472b25471f41446cc0c65b1455470d8afbc2c005f3113a82a82782a013f6c6dab2888c0be260ba52a516bfc2045ce4e7307faa16dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sq/firefox-48.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "7886982f83d57172c9c982f4dd74ba925a04d9506ad0690dadcd8932fceccaab44d20fdbcb571164108281099be051becfdbfbf76f1e52798af7a0fb51c54578"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sq/firefox-48.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "a59386e187da12e21ab1b378b59429e6504ea1c7047d60bcf9fce7ef3de578c92fc8cc791f67c9b6e4577dfa0547da93344899f5ed9c88049437604abd7c70d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sr/firefox-48.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "1e0d31851ddb5fc67aca4aeb30b368e5e1f7818d265f279b033f8fc0fc891d0caee1badaceb3bcc868cfc58ece068efba92c751b3a94d3968f84cf060ea18b4a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sr/firefox-48.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "ffa9176877aea7fe0672a8a5b2fc8f182206cd80d40521057502d981f80c8e2a77fa9dab595a3594774b9e6cd08fb2bb66e8416c17ee59669d0e4d8b6f73e67c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sv-SE/firefox-48.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "15ae7f700d02a1608097b2b1d14f3e560155fb16a43eed962fb359e92525637dd2bd6992f4616640420d3db489b7fdb5e771085f6b502f8ecee55377fcd03be6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sv-SE/firefox-48.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "b8d8f12b9b63e034197344e52145dbba0e3e9a5dc2bf53b3efa8824e3f730ebcaa2a8302c6abfad67c0fb3fa5fd1e76d93bd5be5ac2707b93ed8421fc8e45256"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ta/firefox-48.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "34c6e9235b8c5be2e221f4a3a1e319f201df2247bc54d0e07094190d4b80ad064ccd9b426420ee5b5014ac1fd6d7a5180d39c331bd5d561de942cd00536a57de"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ta/firefox-48.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "2f41636896e79b9d4ec9d772f27f817b7fac7c291335ed1338d6520378be7553698225692883c186f63faf471a94dc9fee4c07a93284dc2df5dbc26655679f73"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/te/firefox-48.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "4ee88c91de2438ea362ae50afe1d8f290bb5cea2103af31d51441385c4c2c78e6ed2ae444b121038c7146eca7efb0acdbb8181f099f9638a25bb91f39b20ca3a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/te/firefox-48.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "c34b58adf0d89093782fc5e9272c298fee026e0f5efd172766f47105ed19617e483cbc9af63d73dc2edeb0025c95db0a5dfb5f31343717b73a431d0bd5a5a20a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/th/firefox-48.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "887d830f0afe21759212a8d112d2b4da48613488c3e69dec1d526eacc067a23ce0d58245151b89176c2a1d869550cc5e5e6598f3270e43ca4030d8caed583e14"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/th/firefox-48.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "a4113c7f87e6e7f0491d12b7cf65d402c75a5b4dfe9bdedbc69a60f4456f825b60e4170ed49110a42720a57814375c33a14845a653d9f71f51cf417334c2233e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/tr/firefox-48.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "33620a2a49f9cdc39f591c3aa75ad5688437938b1fa31084d74d2ccbfd2cd502e788ca3bd8d863e666b3028c44b1742ef9621c40051cda361b389080f3e54eb9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/tr/firefox-48.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "29b1065949adec1cd057ce242294176d23fd71249d7f727d41dfa81224d744fe0d8f1d19a60b5d8aed680f9e9b2ee2f10d2da9fb5c627aef6e00627b56b0f979"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/uk/firefox-48.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "49140602407a30ffce9d7084bf9b85f1f1c6f9e2464ff61c8ef3c7d7ee8cf23eae9492613718d78d16f56cf0f7473ddd8171526cc64ba599d1770205dacafd10"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/uk/firefox-48.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "200101a9c88cb71474ced39007050cae429f0ddc973a58ffd11b816e749ce3f5dca2f4db50d3b80068a0bd048d383c2847f7a283785d52c5df938d9e20fd76a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/uz/firefox-48.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "37f5469824bd70cc04c7d64f48d29aead9cf4839f795df61f02f109955d299655a730064fd52a98170925ee746ffef1802bc492d474779963bc12851efb8109f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/uz/firefox-48.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "9eeacfc5b02758e79d4b47ca80357c6d8029f64e0fa117f6a73c3f1039190c3edc36ffe24b7231dbb28e5242cee419ee48ae4cd7614d6f7209473502ad4f1a79"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/vi/firefox-48.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "4b6b9f4e95caf2bf331cf2fa910ccd8ea89c4bb34afdbc9eb2d972f1efb7a7929adb6701356a70d1567fe71dd857c9b1b8076aaeea916b8a4fd025675305b8e7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/vi/firefox-48.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "635a750087f5eb9d80dd4a9410e1ae3d43deb7ec6c88b2991c74387ae0d6db568cb33db975fbb29586489b09f470b280bf4d5e921aa06a5a881aa8fab02122e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/xh/firefox-48.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "fe3e1e006c71015853e0ed9ee595d1a91be62124f7966e3202cf0bcb10942501c0428f216068d372191268b2757ef55005924d64529337f6bf64c695c2cb8ab5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/xh/firefox-48.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "e6f2276f5a41cab83352c8180aad14ac3328db21dde432e1d5ed7d18d0f98c4ddd7f733fc645d690d0c328382c64d5ee76fee17dd6e6bbbda43a717a22014303"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/zh-CN/firefox-48.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "188d418f0debdda2479b0ff2a355ec0014b04ec8695eb6e2675bc71d8c925eef6e2044024601e1de583d6512a977d5c923963a9be60290bc9928821180b371f5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/zh-CN/firefox-48.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "fc7d5d18c568417d650ab282d0f09ee77a5e49cf9d6c20134a38b8388ed908e00e224be99fb757d7d885bc27ec5f01c6f4555cd5853f837d361e2501db65d723"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/zh-TW/firefox-48.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1a968c979273b21e76625988dc21b8037c405c912730fd2ebba515a13dbc1f6d3807873fbef821f5126af773b91d10b3be444739eff287dda642448e692715af"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/zh-TW/firefox-48.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "1b79bf4dbe43574342f8093c036ae29b2f2f4d88e1201e9fda0e190ab00e5319ae5fe830745c0b01d66deed73f04be7313ac4e3b3438afa22c75f03cde8d0fa2"; } ]; } From 99180fed1fdd83499b207db8ee183f77cc96fe34 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 21 Jul 2016 01:01:34 +0200 Subject: [PATCH 117/126] pythonPackages.py3status: 2.9 -> 3.0 --- 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 fba53ac0cf9..f4a6f8ae558 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8221,13 +8221,13 @@ in modules // { }; py3status = buildPythonPackage rec { - version = "2.9"; + version = "3.0"; name = "py3status-${version}"; src = pkgs.fetchFromGitHub { owner = "ultrabug"; repo = "py3status"; rev = version; - sha256 = "1nvdqwhgk0zff5kspgrh5c5vg1vdnz6gpjplbqi3nz41qws48f1y"; + sha256 = "1mnl0rfbnimcpp7q9hva0x9jfa58j4nc27r9kvaii8869kzssw48"; }; propagatedBuildInputs = with self; [ requests2 ]; prePatch = '' From d9871f52b49719ce55fcc089fa2cd12c67e9f0d7 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 21 Jul 2016 01:01:57 +0200 Subject: [PATCH 118/126] xonsh: 0.4.1 -> 0.4.3 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 608fa02a126..a2689fc64c1 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = version; - sha256= "1d5w307vgpqjimhfipkwsnh3lvvajva9fjl58sg9hh322qicm01g"; + sha256= "1lx95i468px908y18fa9fmfgmjsydhkpas89dxbwfnybqxxyd3ls"; }; ## The logo xonsh prints during build contains unicode characters, and this From 2df3fde700daf20a00188de616e677bc57c9794f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 21 Jul 2016 01:05:51 +0200 Subject: [PATCH 119/126] ocamlPackage.ppx_blob: init at 0.2 (#17129) OCaml ppx to include binary data from a file as a string. --- .../ocaml-modules/ppx_blob/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ppx_blob/default.nix diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix new file mode 100644 index 00000000000..4775b2fe12e --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildOcaml, fetchurl, ppx_tools }: + +buildOcaml rec { + name = "ppx_blob"; + version = "0.2"; + + src = fetchurl { + url = "https://github.com/johnwhitington/ppx_blob/archive/v${version}.tar.gz"; + sha256 = "0kvqfm47f4xbgz0cl7ayz29myyb24xskm35svqrgakjq12nkpsss"; + }; + + buildInputs = [ ppx_tools ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/johnwhitington/ppx_blob"; + description = "OCaml ppx to include binary data from a file as a string"; + license = licenses.unlicense; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f822c518f4..8d58b70cf7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5323,6 +5323,11 @@ in pprint = callPackage ../development/ocaml-modules/pprint { }; + ppx_blob = + if lib.versionAtLeast ocaml_version "4.02" + then callPackage ../development/ocaml-modules/ppx_blob {} + else null; + ppx_tools = if lib.versionAtLeast ocaml_version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {} From c54a9c73aca308b66e4bf945214a159b371d5c77 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 21 Jul 2016 01:06:36 +0200 Subject: [PATCH 120/126] cask: 0.7.3 -> 0.7.4 (#17107) --- .../editors/emacs-modes/cask/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 803a7d542df..0566e0e8b87 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit, emacs, python }: +{ stdenv, fetchFromGitHub, emacs, python }: stdenv.mkDerivation rec { - name = "cask-0.7.3"; + version = "0.7.4"; + name = "cask-${version}"; - src = fetchgit { - url = "https://github.com/cask/cask.git"; - rev = "717b64a9ba7640ec366e8573da0c01f9c4d57b0c"; - sha256 = "0bq24hac1z77g1bybwlk991dcc3pss2gjpwq0a6vvrqg5hw02lsf"; + src = fetchFromGitHub { + owner = "cask"; + repo = "cask"; + rev = "v${version}"; + sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l"; }; buildInputs = [ emacs python ]; From 4a9b640f37c3984a2fddee0a953ed9f198f1bed3 Mon Sep 17 00:00:00 2001 From: cransom Date: Wed, 20 Jul 2016 19:07:59 -0400 Subject: [PATCH 121/126] smokeping: init at 2.6.11 (#17090) Includes a module for service setup and a test to verify functionality of both service and pkg. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/networking/smokeping.nix | 261 ++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/smokeping.nix | 31 +++ pkgs/tools/networking/smokeping/default.nix | 26 ++ pkgs/top-level/all-packages.nix | 7 + pkgs/top-level/perl-packages.nix | 36 +++ 8 files changed, 365 insertions(+) create mode 100644 nixos/modules/services/networking/smokeping.nix create mode 100644 nixos/tests/smokeping.nix create mode 100644 pkgs/tools/networking/smokeping/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 581cd4fb631..7f387b25a20 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -270,6 +270,7 @@ toxvpn = 247; squeezelite = 248; turnserver = 249; + smokeping = 250; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -510,6 +511,7 @@ #toxvpn = 247; # unused #squeezelite = 248; #unused turnserver = 249; + smokeping = 250; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 22daf532db9..cd0ca6fcf35 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -396,6 +396,7 @@ ./services/networking/shairport-sync.nix ./services/networking/shout.nix ./services/networking/sniproxy.nix + ./services/networking/smokeping.nix ./services/networking/softether.nix ./services/networking/spiped.nix ./services/networking/sslh.nix diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix new file mode 100644 index 00000000000..f7a5926dc64 --- /dev/null +++ b/nixos/modules/services/networking/smokeping.nix @@ -0,0 +1,261 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + + cfg = config.services.smokeping; + smokepingHome = "/var/lib/smokeping"; + smokepingPidDir = "/run"; + configFile = '' + *** General *** + owner = ${cfg.owner} + contact = ${cfg.ownerEmail} + mailhost = ${cfg.mailHost} + #sendmail = /var/setuid-wrappers/sendmail + imgcache = ${smokepingHome}/cache + imgurl = http://${cfg.hostName}:${builtins.toString cfg.port}/cache + datadir = ${smokepingHome}/data + piddir = ${smokepingPidDir} + cgiurl = http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi + smokemail = ${cfg.smokeMailTemplate} + *** Presentation *** + template = ${cfg.presentationTemplate} + ${cfg.presentationConfig} + #*** Alerts *** + #${cfg.alertConfig} + *** Database *** + ${cfg.databaseConfig} + *** Probes *** + ${cfg.probeConfig} + *** Targets *** + ${cfg.targetConfig} + ${cfg.extraConfig} + ''; + configPath = pkgs.writeText "smokeping.conf" configFile; + cgiHome = pkgs.writeScript "smokeping.fcgi" '' + #!${pkgs.bash}/bin/bash + ${cfg.package}/bin/smokeping_cgi ${configPath} + ''; +in + +{ + options = { + services.smokeping = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the smokeping service"; + }; + webService = mkOption { + type = types.bool; + default = true; + description = "Enable a smokeping web interface"; + }; + + user = mkOption { + type = types.string; + default = "smokeping"; + description = "User that runs smokeping and (optionally) thttpd"; + }; + mailHost = mkOption { + type = types.string; + default = "127.0.0.1"; + description = "Use this SMTP server rather than localhost"; + }; + smokeMailTemplate = mkOption { + type = types.string; + default = "${cfg.package}/etc/smokemail.dist"; + description = "Specify the smokemail template for alerts."; + }; + + package = mkOption { + type = types.package; + default = pkgs.smokeping; + description = "Specify a custom smokeping package"; + }; + owner = mkOption { + type = types.string; + default = "nobody"; + example = "Joe Admin"; + description = "Real name of the owner of the instance"; + }; + hostName = mkOption { + type = types.string; + default = config.networking.hostName; + example = "somewhere.example.com"; + description = "DNS name for the urls generated in the cgi."; + }; + port = mkOption { + type = types.int; + default = 8081; + example = 8081; + description = "TCP port to use for the web server."; + }; + ownerEmail = mkOption { + type = types.string; + default = "no-reply@${cfg.hostName}"; + example = "no-reply@yourdomain.com"; + description = "Email contact for owner"; + }; + + databaseConfig = mkOption { + type = types.string; + default = '' + step = 300 + pings = 20 + # consfn mrhb steps total + AVERAGE 0.5 1 1008 + AVERAGE 0.5 12 4320 + MIN 0.5 12 4320 + MAX 0.5 12 4320 + AVERAGE 0.5 144 720 + MAX 0.5 144 720 + MIN 0.5 144 720 + + ''; + example = literalExample '' + # near constant pings. + step = 30 + pings = 20 + # consfn mrhb steps total + AVERAGE 0.5 1 10080 + AVERAGE 0.5 12 43200 + MIN 0.5 12 43200 + MAX 0.5 12 43200 + AVERAGE 0.5 144 7200 + MAX 0.5 144 7200 + MIN 0.5 144 7200 + ''; + description = ''Configure the ping frequency and retention of the rrd files. + Once set, changing the interval will require deletion or migration of all + the collected data.''; + }; + alertConfig = mkOption { + type = types.string; + default = ""; + example = literalExample '' + to = alertee@address.somewhere + from = smokealert@company.xy + + +someloss + type = loss + # in percent + pattern = >0%,*12*,>0%,*12*,>0% + comment = loss 3 times in a row; + ''; + description = "Configuration for alerts."; + }; + presentationTemplate = mkOption { + type = types.string; + default = "${pkgs.smokeping}/etc/basepage.html.dist"; + description = "Default page layout for the web UI."; + }; + + presentationConfig = mkOption { + type = types.string; + default = '' + + charts + menu = Charts + title = The most interesting destinations + ++ stddev + sorter = StdDev(entries=>4) + title = Top Standard Deviation + menu = Std Deviation + format = Standard Deviation %f + ++ max + sorter = Max(entries=>5) + title = Top Max Roundtrip Time + menu = by Max + format = Max Roundtrip Time %f seconds + ++ loss + sorter = Loss(entries=>5) + title = Top Packet Loss + menu = Loss + format = Packets Lost %f + ++ median + sorter = Median(entries=>5) + title = Top Median Roundtrip Time + menu = by Median + format = Median RTT %f seconds + + overview + width = 600 + height = 50 + range = 10h + + detail + width = 600 + height = 200 + unison_tolerance = 2 + "Last 3 Hours" 3h + "Last 30 Hours" 30h + "Last 10 Days" 10d + "Last 360 Days" 360d + ''; + description = "presentation graph style"; + }; + probeConfig = mkOption { + type = types.string; + default = '' + + FPing + binary = ${pkgs.fping}/bin/fping + ''; + description = "Probe configuration"; + }; + targetConfig = mkOption { + type = types.string; + default = '' + probe = FPing + menu = Top + title = Network Latency Grapher + remark = Welcome to the SmokePing website of xxx Company. \ + Here you will learn all about the latency of our network. + + Local + menu = Local + title = Local Network + ++ LocalMachine + menu = Local Machine + title = This host + host = localhost + ''; + description = "Target configuration"; + }; + extraConfig = mkOption { + type = types.string; + default = ""; + description = "Any additional customization not already included."; + }; + + }; + + }; + + config = mkIf cfg.enable { + users.extraUsers = singleton { + name = cfg.user; + isNormalUser = false; + isSystemUser = true; + uid = config.ids.uids.smokeping; + description = "smokeping daemon user"; + home = smokepingHome; + }; + systemd.services.smokeping = { + wantedBy = [ "multi-user.target"]; + serviceConfig.User = cfg.user; + serviceConfig.PermissionsStartOnly = true; + preStart = '' + mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data + chown -R ${cfg.user} ${smokepingHome} + cp ${cgiHome} ${smokepingHome}/smokeping.fcgi + ${cfg.package}/bin/smokeping --check --config=${configPath} + ''; + script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon''; + }; + systemd.services.thttpd = mkIf cfg.webService { + wantedBy = [ "multi-user.target"]; + requires = [ "smokeping.service"]; + partOf = [ "smokeping.service"]; + path = with pkgs; [ bash rrdtool smokeping ]; + script = ''${pkgs.thttpd}/bin/thttpd -u ${cfg.user} -c "**.fcgi" -d ${smokepingHome} -p ${builtins.toString cfg.port} -D''; + }; + }; +} + diff --git a/nixos/release.nix b/nixos/release.nix index 184e340341f..966dee1aff0 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -272,6 +272,7 @@ in rec { tests.sddm = callTest tests/sddm.nix {}; tests.sddm-kde5 = callTest tests/sddm-kde5.nix {}; tests.simple = callTest tests/simple.nix {}; + tests.smokeping = callTest tests/smokeping.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix new file mode 100644 index 00000000000..324f83147e0 --- /dev/null +++ b/nixos/tests/smokeping.nix @@ -0,0 +1,31 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "smokeping"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ cransom ]; + }; + + nodes = { + sm = + { pkgs, config, ... }: + { + services.smokeping = { + enable = true; + port = 8081; + probeConfig = '' + + FPing + binary = ${pkgs.fping}/bin/fping + offset = 0% + ''; + }; + }; + }; + + testScript = '' + startAll; + $sm->waitForUnit("smokeping"); + $sm->waitForUnit("thttpd"); + $sm->waitForFile("/var/lib/smokeping/data/Local/LocalMachine.rrd"); + $sm->succeed("curl -s -f localhost:8081/smokeping.fcgi?target=Local"); + $sm->succeed("ls /var/lib/smokeping/cache/Local/LocalMachine_mini.png"); + ''; +}) diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix new file mode 100644 index 00000000000..334a6feb8d5 --- /dev/null +++ b/pkgs/tools/networking/smokeping/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, fping, rrdtool, FCGI, CGI +, CGIFast, ConfigGrammar, DigestHMAC, NetTelnet +, NetOpenSSH, NetSNMP, LWP, IOTty, perl, NetDNS +, NetLDAP +}: + +stdenv.mkDerivation rec { + name = "smokeping-${version}"; + version = "2.6.11"; + src = fetchurl { + url = "http://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; + sha256 = "1p9hpa2zs33p7hzrds80kwrm5255s0869v3s3qmsyx2sx63c7czj"; + }; + propagatedBuildInputs = [ + rrdtool FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet NetOpenSSH + NetSNMP LWP IOTty fping perl NetDNS NetLDAP ]; + postInstall = '' + mv $out/htdocs/smokeping.fcgi.dist $out/htdocs/smokeping.fcgi + ''; + meta = { + description = "Network latency collector"; + homepage = "http://oss.oetiker.ch/smokeping"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d58b70cf7b..4c003ad41b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17162,6 +17162,13 @@ in slock = callPackage ../misc/screensavers/slock { }; + smokeping = callPackage ../tools/networking/smokeping { + inherit fping rrdtool; + inherit (perlPackages) + FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet + NetOpenSSH NetSNMP LWP IOTty perl NetDNS NetLDAP; + }; + snapraid = callPackage ../tools/filesystems/snapraid { }; soundOfSorting = callPackage ../misc/sound-of-sorting { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d50237f06d5..387e886927e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2149,6 +2149,18 @@ let self = _self // overrides; _self = with self; { }; }; + ConfigGrammar = buildPerlPackage { + name = "Config-Grammar-1.11"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.11.tar.gz; + sha256 = "dd819f89b19c51e9fac6965360cd9db54436e1328968c802416ac34188ca65ee"; + }; + meta = { + description = "A grammar-based, user-friendly config parser"; + license = "unknown"; + }; + }; + ConfigINI = buildPerlPackage rec { name = "Config-INI-0.025"; src = fetchurl { @@ -9537,6 +9549,18 @@ let self = _self // overrides; _self = with self; { }; }; + NetTelnet = buildPerlPackage { + name = "Net-Telnet-3.04"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.04.tar.gz; + sha256 = "e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a"; + }; + meta = { + description = "Interact with TELNET port or other TCP ports"; + license = "unknown"; + }; + }; + NetTwitterLite = buildPerlPackage { name = "Net-Twitter-Lite-0.11002"; src = fetchurl { @@ -9665,6 +9689,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CGI NetOpenIDCommon JSON LWP ]; }; + NetOpenSSH = buildPerlPackage { + name = "Net-OpenSSH-0.70"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.70.tar.gz; + sha256 = "3fcb36a5a2fc296c1d0def54f3201cecffe7d81157ef5fa2bac9868875f63b95"; + }; + meta = { + description = "Perl SSH client package implemented on top of OpenSSH"; + license = "perl"; + }; + }; + PackageConstants = buildPerlPackage { name = "Package-Constants-0.04"; src = fetchurl { From 4e84c6fc7cbf3f66267be56c2af518e6efe236fc Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 20 Jul 2016 19:09:36 -0400 Subject: [PATCH 122/126] cnijfilter2: init at 5.30 (#17048) Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series. --- .../misc/cups/drivers/cnijfilter2/default.nix | 122 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 126 insertions(+) create mode 100644 pkgs/misc/cups/drivers/cnijfilter2/default.nix diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix new file mode 100644 index 00000000000..1e95d63e517 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -0,0 +1,122 @@ +{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb +, withDebug ? false }: + +stdenv.mkDerivation rec { + name = "cnijfilter2-${version}"; + + version = "5.30"; + + src = fetchzip { + url = "http://gdlp01.c-wss.com/gds/9/0100007129/01/cnijfilter2-source-5.30-1.tar.gz"; + sha256 = "0gnl9arwmkblljsczspcgggx85a19vcmhmbjfyv1bq236yqixv5c"; + }; + + buildInputs = [ + cups automake autoconf glib libxml2 libusb + ]; + + # lgmon3's --enable-libdir flag is used soley for specifying in which + # directory the cnnnet.ini cache file should reside. + # NixOS uses /var/cache/cups, and given the name, it seems like a reasonable + # place to put the cnnet.ini file, and thus we do so. + # + # Note that the drivers attempt to dlopen + # $out/lib/cups/filter/libcnbpcnclapicom2.so + buildPhase = '' + mkdir -p $out/lib + cp com/libs_bin64/* $out/lib + mkdir -p $out/lib/cups/filter + ln -s $out/lib/libcnbpcnclapicom2.so $out/lib/cups/filter + + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib" + '' + lib.optionalString withDebug '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__DEBUG__ -DDEBUG_LOG" + '' + '' + + ( + cd lgmon3 + substituteInPlace src/Makefile.am \ + --replace /usr/include/libusb-1.0 \ + ${libusb.dev}/include/libusb-1.0 + ./autogen.sh --prefix=$out --enable-progpath=$out/bin \ + --enable-libdir=/var/cache/cups + make + ) + + ( + cd cmdtocanonij2 + ./autogen.sh --prefix=$out + make + ) + + ( + cd cnijbe2 + substituteInPlace src/Makefile.am \ + --replace "/usr/lib/cups/backend" \ + "$out/lib/cups/backend" + ./autogen.sh --prefix=$out --enable-progpath=$out/bin + make + ) + + ( + cd rastertocanonij + ./autogen.sh --prefix=$out --enable-progpath=$out/bin + make + ) + + ( + cd tocanonij + ./autogen.sh --prefix=$out --enable-progpath=$out/bin + make + ) + + ( + cd tocnpwg + ./autogen.sh --prefix=$out --enable-progpath=$out/bin + make + ) + ''; + + installPhase = '' + ( + cd lgmon3 + make install + ) + + ( + cd cmdtocanonij2 + make install + ) + + ( + cd cnijbe2 + make install + ) + + ( + cd rastertocanonij + make install + ) + + ( + cd tocanonij + make install + ) + + ( + cd tocnpwg + make install + ) + + mkdir -p $out/share/cups/model + cp ppd/*.ppd $out/share/cups/model + ''; + + meta = with lib; { + description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; + homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c003ad41b0..e7a471ab702 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16854,6 +16854,10 @@ in cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; + cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { + libusb = libusb1; + }; + darcnes = callPackage ../misc/emulators/darcnes { }; darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; From 5682279d1404ce1a935b63a267327ec5176208e3 Mon Sep 17 00:00:00 2001 From: edanaher Date: Wed, 20 Jul 2016 19:12:31 -0400 Subject: [PATCH 123/126] pidgin-osd: init at 0.1.0 (#16792) * pidgin-osd: init at 0.1.0 A straightforward pidgin plugin; kind of ancient, but still works fine. * Use autoreconf, which minor hackery around ChangeLog. --- .../pidgin-plugins/pidgin-osd/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix new file mode 100644 index 00000000000..9c0f64d6574 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pidgin, xosd +, autoreconfHook } : + +stdenv.mkDerivation rec { + name = "pidgin-osd-0.1.0"; + src = fetchurl { + url = https://github.com/mbroemme/pidgin-osd/archive/pidgin-osd-0.1.0.tar.gz; + sha256 = "11hqfifhxa9gijbnp9kq85k37hvr36spdd79cj9bkkvw4kyrdp3j"; + }; + + makeFlags = "PIDGIN_LIBDIR=$(out)"; + + # autoreconf is run such that it *really* wants all the files, and there's no + # default ChangeLog. So make it happy. + preAutoreconf = "touch ChangeLog"; + + postInstall = '' + mkdir -p $out/lib/pidgin + ln -s $out/pidgin $out/lib/pidgin + ''; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ xosd pidgin ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mbroemme/pidgin-osd; + description = "Plugin for Pidgin which implements on-screen display via libxosd"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7a471ab702..a4a217f77b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14141,6 +14141,8 @@ in pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; + pidginosd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; + pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; pidginwindowmerge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; From 79f6c2603c1f50f54ad8aa4d9eec5ad633173c88 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 20 Jul 2016 20:19:06 -0300 Subject: [PATCH 124/126] Gofish: nit at 1.2 (#16532) Gofish is a lightweight Gopher server. --- pkgs/servers/gopher/gofish/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/servers/gopher/gofish/default.nix diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix new file mode 100644 index 00000000000..754cba58825 --- /dev/null +++ b/pkgs/servers/gopher/gofish/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + + name = "gofish-${version}"; + version = "1.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/gofish/gofish/${version}/${name}.tar.gz"; + sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s"; + }; + + meta = with stdenv.lib; { + description = "A lightweight Gopher server"; + homepage = http://gofish.sourceforge.net/; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a217f77b8..be179a95156 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10170,6 +10170,8 @@ in glabels = callPackage ../applications/graphics/glabels { }; + gofish = callPackage ../servers/gopher/gofish { }; + grafana = (callPackage ../servers/monitoring/grafana { }).bin // { outputs = ["bin"]; }; groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-0_10; }; From 398d3ddc1b4edffc833cb1e1dbdf28a75d8ec352 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 20 Jul 2016 19:33:39 -0400 Subject: [PATCH 125/126] go-ethereum: init at 1.4.7 (#16353) --- pkgs/applications/altcoins/default.nix | 2 ++ pkgs/applications/altcoins/go-ethereum.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/applications/altcoins/go-ethereum.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 0b0e42699ed..8e25f01c1bd 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -16,6 +16,8 @@ rec { dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; + go-ethereum = callPackage ./go-ethereum.nix { }; + litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix new file mode 100644 index 00000000000..3beb38e0d2d --- /dev/null +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, go, fetchgit }: + +stdenv.mkDerivation rec { + name = "go-ethereum-${version}"; + version = "1.4.7"; + rev = "refs/tags/v${version}"; + goPackagePath = "github.com/ethereum/go-ethereum"; + + buildInputs = [ go ]; + + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "19q518kxkvrr44cvsph4wv3lr6ivqsckz1f22r62932s3sq6gyd8"; + }; + + buildPhase = '' + export GOROOT=$(mktemp -d --suffix=-goroot) + ln -sv ${go}/share/go/* $GOROOT + ln -svf ${go}/bin $GOROOT + make all + ''; + + installPhase = '' + mkdir -p $out/bin + cp -v build/bin/* $out/bin + ''; + + meta = { + homepage = "https://ethereum.github.io/go-ethereum/"; + description = "Official golang implementation of the Ethereum protocol"; + license = with lib.licenses; [ lgpl3 gpl3 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cee4c71db81..5a63cfe2af4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12207,6 +12207,8 @@ in bitcoin = self.altcoins.bitcoin; bitcoin-xt = self.altcoins.bitcoin-xt; + go-ethereum = self.altcoins.go-ethereum; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; From 83bdc8e8583d2fae8751a347de8a5f6446a53d98 Mon Sep 17 00:00:00 2001 From: davidak Date: Thu, 21 Jul 2016 01:51:09 +0200 Subject: [PATCH 126/126] caddy service: add options to change ACME certificate authority (#16969) and agree to let's encrypt subscriber agreement --- nixos/modules/services/web-servers/caddy.nix | 26 ++++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index b84431373bd..0666dfddaff 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -14,12 +14,26 @@ in description = "Verbatim Caddyfile to use"; }; + ca = mkOption { + default = "https://acme-v01.api.letsencrypt.org/directory"; + example = "https://acme-staging.api.letsencrypt.org/directory"; + type = types.string; + description = "Certificate authority ACME server. The default (Let's Encrypt production server) should be fine for most people."; + }; + email = mkOption { default = ""; type = types.string; description = "Email address (for Let's Encrypt certificate)"; }; + agree = mkOption { + default = false; + example = true; + type = types.bool; + description = "Agree to Let's Encrypt Subscriber Agreement"; + }; + dataDir = mkOption { default = "/var/lib/caddy"; type = types.path; @@ -33,11 +47,13 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.caddy.bin}/bin/caddy -conf=${configFile} -email=${cfg.email}"; - Type = "simple"; - User = "caddy"; - Group = "caddy"; - AmbientCapabilities = "cap_net_bind_service"; + ExecStart = ''${pkgs.caddy.bin}/bin/caddy -conf=${configFile} \ + -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} + ''; + Type = "simple"; + User = "caddy"; + Group = "caddy"; + AmbientCapabilities = "cap_net_bind_service"; }; };