From b860b106c548e0bcbf5475afe9e47e1d39b1c0e7 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 18 Sep 2015 15:56:05 +0200 Subject: [PATCH 01/44] sage: 6.1.1 -> 6.8 --- .../science/math/sage/default.nix | 21 ++++++++------ .../science/math/sage/spkg-git.patch | 11 ++++++++ .../science/math/sage/spkg-python.patch | 11 ++++++++ .../science/math/sage/spkg-singular.patch | 28 +++++++++++++++++++ 4 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/science/math/sage/spkg-git.patch create mode 100644 pkgs/applications/science/math/sage/spkg-python.patch create mode 100644 pkgs/applications/science/math/sage/spkg-singular.patch diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index a27a93dd2c64..a19a49774404 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -1,27 +1,32 @@ { stdenv, fetchurl, m4, perl, gfortran, texLive, ffmpeg, tk -, imagemagick, liblapack +, imagemagick, liblapack, python, openssl, libpng +, which }: stdenv.mkDerivation rec { - name = "sage-6.1.1"; + name = "sage-6.8"; src = fetchurl { url = "mirror://sagemath/${name}.tar.gz"; - sha256 = "0kbzs0l9q7y34jv3f8rd1c2mrjsjkdgaw6mfdwjlpg9g4gghmq5y"; + sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9"; }; - buildInputs = [ m4 perl gfortran texLive ffmpeg tk imagemagick liblapack ]; + buildInputs = [ m4 perl gfortran texLive ffmpeg tk imagemagick liblapack + python openssl libpng which]; + + patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ]; enableParallelBuilding = true; preConfigure = '' export SAGE_NUM_THREADS=$NIX_BUILD_CORES - sed -i 's/if ! [ -d "$HOME" ]/if [ -d "$HOME" ]/' src/bin/sage-env - '' + stdenv.lib.optionalString stdenv.isDarwin '' - sed -i "s/ld_version = try_run('ld -v')/ld_version = 'Apple'/" \ - build/pkgs/atlas/configuration.py + export SAGE_ATLAS_ARCH=fast + mkdir -p $out/sageHome + export HOME=$out/sageHome ''; + installPhase = ''DESTDIR=$out make install''; + meta = { homepage = "http://www.sagemath.org"; description = "A free open source mathematics software system"; diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch new file mode 100644 index 000000000000..a3e768a7c240 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-git.patch @@ -0,0 +1,11 @@ +--- old/build/pkgs/git/spkg-install 2015-07-26 15:34:43.000000000 +0200 ++++ new/build/pkgs/git/spkg-install 2015-09-17 08:28:03.586657451 +0200 +@@ -45,6 +45,8 @@ + fi + done + ++find . -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' ++ + # We don't want to think about Fink or Macports + export NO_FINK=1 + export NO_DARWIN_PORTS=1 diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch new file mode 100644 index 000000000000..4db9427e3e02 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-python.patch @@ -0,0 +1,11 @@ +--- old/build/pkgs/python2/spkg-install 2015-07-26 15:34:43.000000000 +0200 ++++ new/build/pkgs/python2/spkg-install 2015-09-16 20:48:51.904555797 +0200 +@@ -32,7 +32,7 @@ + done + + # We are setting LDFLAGS so that we pick up Sage's readline +-LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS" ++LDFLAGS="-L$SAGE_LOCAL/lib -lcrypt $LDFLAGS" + export LDFLAGS + + if [ "$SAGE_DEBUG" = "yes" ]; then diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch new file mode 100644 index 000000000000..a4c29825a4c4 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-singular.patch @@ -0,0 +1,28 @@ +--- old/build/pkgs/singular/spkg-install 2015-07-26 15:34:43.000000000 +0200 ++++ new/build/pkgs/singular/spkg-install 2015-09-15 20:42:51.716505855 +0200 +@@ -115,6 +115,11 @@ + done + } + ++nix_nuke_bin_rm() ++{ ++ find . -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' ++} ++ + remove_old_version() + { + rm -f "$SAGE_LOCAL"/bin/Singular* +@@ -306,11 +311,11 @@ + + + # Actually run all the functions defined above +-for i in choose_patches apply_patches remove_old_version config \ ++for i in choose_patches apply_patches nix_nuke_bin_rm remove_old_version config \ + build_singular build_libsingular build_factory build_libfac \ + create_singular_script install_docs ; do + echo "### Singular spkg-install: $i ###" +- cd "$SRC" && $i ++ cd "$SRC" && pwd && $i + if [ $? -ne 0 ]; then + echo >&2 "Error building Singular (error in $i)." + exit 1 From 05c46bfc05cc75ed7d52e75f59ae490fe8c4833b Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Sat, 26 Sep 2015 18:34:36 +0200 Subject: [PATCH 02/44] systemd module: add option to specify generators Adding the configuration option 'systemd.generators' to specify systemd system-generators. The option allows to either add new system-generators to systemd, or to over- ride or disable the system-generators provided by systemd. Internally, the configuration option 'systemd.generators' maps onto the 'environment.etc' configuration option. Having a convenience wrapper around 'environment.etc' helps to group the systemd system-generator configuration more easily with other 'systemd...' configurations. --- nixos/modules/system/boot/systemd.nix | 52 +++++++++++++++------------ 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 4976dfe8eea4..13c44e0930a3 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -445,6 +445,17 @@ in ''; }; + systemd.generators = mkOption { + type = types.attrsOf types.path; + default = {}; + example = { "systemd-gpt-auto-generator" = "/dev/null"; }; + description = '' + Definition of systemd generators. + For each NAME = VALUE pair of the attrSet, a link is generated from + /etc/systemd/system-generators/NAME to VALUE. + ''; + }; + systemd.defaultUnit = mkOption { default = "multi-user.target"; type = types.str; @@ -601,20 +612,17 @@ in environment.systemPackages = [ systemd ]; - environment.etc."systemd/system".source = - generateUnits "system" cfg.units upstreamSystemUnits upstreamSystemWants; + environment.etc = { + "systemd/system".source = generateUnits "system" cfg.units upstreamSystemUnits upstreamSystemWants; - environment.etc."systemd/user".source = - generateUnits "user" cfg.user.units upstreamUserUnits []; + "systemd/user".source = generateUnits "user" cfg.user.units upstreamUserUnits []; - environment.etc."systemd/system.conf".text = - '' + "systemd/system.conf".text = '' [Manager] ${config.systemd.extraConfig} ''; - environment.etc."systemd/journald.conf".text = - '' + "systemd/journald.conf".text = '' [Journal] RateLimitInterval=${config.services.journald.rateLimitInterval} RateLimitBurst=${toString config.services.journald.rateLimitBurst} @@ -625,17 +633,26 @@ in ${config.services.journald.extraConfig} ''; - environment.etc."systemd/logind.conf".text = - '' + "systemd/logind.conf".text = '' [Login] ${config.services.logind.extraConfig} ''; - environment.etc."systemd/sleep.conf".text = - '' + "systemd/sleep.conf".text = '' [Sleep] ''; + "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf"; + "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf"; + + "tmpfiles.d/nixos.conf".text = '' + # This file is created automatically and should not be modified. + # Please change the option ‘systemd.tmpfiles.rules’ instead. + + ${concatStringsSep "\n" cfg.tmpfiles.rules} + ''; + } // mapAttrs' (n: v: nameValuePair "systemd/system-generators/${n}" {"source"=v;}) cfg.generators; + system.activationScripts.systemd = stringAfter [ "groups" ] '' mkdir -m 0755 -p /var/lib/udev @@ -736,17 +753,6 @@ in startSession = true; }; - environment.etc."tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf"; - environment.etc."tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf"; - - environment.etc."tmpfiles.d/nixos.conf".text = - '' - # This file is created automatically and should not be modified. - # Please change the option ‘systemd.tmpfiles.rules’ instead. - - ${concatStringsSep "\n" cfg.tmpfiles.rules} - ''; - # Some overrides to upstream units. systemd.services."systemd-backlight@".restartIfChanged = false; systemd.services."systemd-rfkill@".restartIfChanged = false; From 40773c7605abaeb02cbd6d2b738419a0d5fe3f38 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Sep 2015 15:57:02 -0700 Subject: [PATCH 03/44] kernel: 4.1.8 -> 4.1.9 --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 1a84e00f7888..51844f1e0684 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.8"; + version = "4.1.9"; # Remember to update grsecurity! extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1zhck5892c3anbifq3d0ngy40zm9q4c651kgkjk9wf32jjpnngar"; + sha256 = "141s028bpci5fwn190rgcivhk0066nkc2h6y49yqdjdanx47i1sr"; }; features.iwlwifi = true; From 05fd70b4be7d80dedcb005698ed4d2095111a6b1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Sep 2015 15:57:08 -0700 Subject: [PATCH 04/44] kernel: 4.2.1 -> 4.2.2 --- pkgs/os-specific/linux/kernel/linux-4.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index d82e567de8fe..7584f69937d5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.2.1"; + version = "4.2.2"; extraMeta.branch = "4.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1b4dpf3rhr1sb1hpz4qx3h1swlcr1xnbrh6sjybqmj2c6szkbpvz"; + sha256 = "0k5nda60jla02n7ghhma7klkfklh008d1cpf684fp82cywbp5g1f"; }; features.iwlwifi = true; From 49da51697bd0be320fbefd475c7953304dcd6f7b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Sep 2015 22:54:05 +0200 Subject: [PATCH 05/44] redshift: use our own XDG_DATA_DIRS --- pkgs/applications/misc/redshift/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 99731a598b66..5f4120dae491 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation { postInstall = stdenv.lib.optionalString guiSupport '' wrapProgram "$out/bin/redshift-gtk" \ --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "$out/share" ''; meta = with stdenv.lib; { From bc46be7fc9d339314635e79cfd108b5e167fc02b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Sep 2015 23:00:45 +0200 Subject: [PATCH 06/44] fmit: correct stdenv.lib.{optional -> optionals} --- pkgs/applications/audio/fmit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 16573936068b..36988c980917 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation { }; buildInputs = [ fftw freeglut qtbase qtmultimedia ] - ++ stdenv.lib.optional alsaSupport [ alsaLib ] - ++ stdenv.lib.optional jackSupport [ libjack2 ] - ++ stdenv.lib.optional portaudioSupport [ portaudio ]; + ++ stdenv.lib.optionals alsaSupport [ alsaLib ] + ++ stdenv.lib.optionals jackSupport [ libjack2 ] + ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; configurePhase = '' mkdir build From fc381c5e0ccdefcde1acefed729bafced5d18a75 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Sep 2015 23:08:19 +0200 Subject: [PATCH 07/44] mcelog: 127 -> 128 Fix spurious assertion when parsing sysfs. --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 70f3f3f27b5a..93a25f919904 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "127"; in +let version = "128"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "0ap00f283d1hhv0f6l2fwsbq7sd6b96lf3jwg5cyam03pj2l8qk1"; + sha256 = "0hm1dmqyh36dig158iyb9fckmvqnd5sgpy1qzj59nsg40pb1vbjs"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From 7e3bd2e86d11b0a48fd07b88bab53eacf3aa886e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Sep 2015 23:08:34 +0200 Subject: [PATCH 08/44] mcelog: build in parallel --- pkgs/os-specific/linux/mcelog/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 93a25f919904..f88e4b2fb753 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace '"unknown"' '"${version}"' ''; + enableParallelBuilding = true; + installFlags = "DESTDIR=$(out) prefix= DOCDIR=/share/doc"; meta = with stdenv.lib; { From c7c677bc7b5906fa5e42b8a77442908ab7fed6f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Sep 2015 02:29:21 +0200 Subject: [PATCH 09/44] p910nd: init at 0.97 --- pkgs/servers/p910nd/default.nix | 48 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/servers/p910nd/default.nix diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix new file mode 100644 index 000000000000..ea5214c7bb44 --- /dev/null +++ b/pkgs/servers/p910nd/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl }: + +let + version = "0.97"; + name = "p910nd-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchurl { + sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa"; + url = "mirror://sourceforge/p910nd/${name}.tar.bz2"; + }; + + postPatch = '' + sed -e "s|/usr||g" -i Makefile + ''; + + makeFlags = "DESTDIR=$(out) BINDIR=/bin"; + + postInstall = '' + # Match the man page: + mv $out/etc/init.d/p910nd{,.sh} + + # The legacy init script is useful only (and even then...) as an example: + mkdir -p $out/share/doc/examples + mv $out/etc $out/share/doc/examples + ''; + + meta = with stdenv.lib; { + inherit version; + description = "Small printer daemon passing jobs directly to the printer"; + longDescription = '' + p910nd is a small printer daemon intended for diskless platforms that + does not spool to disk but passes the job directly to the printer. + Normally a lpr daemon on a spooling host connects to it with a TCP + connection on port 910n (where n=0, 1, or 2 for lp0, 1 and 2 + respectively). p910nd is particularly useful for diskless platforms. + Common Unix Printing System (CUPS) supports this protocol, it's called + the AppSocket protocol and has the scheme socket://. LPRng also supports + this protocol and the syntax is lp=remotehost%9100 in /etc/printcap. + ''; + homepage = http://p910nd.sourceforge.net/; + downloadPage = http://sourceforge.net/projects/p910nd/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9137e0dc937..6ccf4b109a60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9080,6 +9080,8 @@ let osrm-backend_luajit = callPackage ../servers/osrm-backend { luabind = luabind_luajit; }; + p910nd = callPackage ../servers/p910nd { }; + petidomo = callPackage ../servers/mail/petidomo { }; popa3d = callPackage ../servers/mail/popa3d { }; From e45e777c373c14b744b2940d806cf02dad84b42f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Sep 2015 17:47:18 -0700 Subject: [PATCH 10/44] kernel: Remove uneeded patch for 4.2 --- .../linux/kernel/flush_workqueue-export.patch | 13 ------------- pkgs/os-specific/linux/kernel/linux-4.2.nix | 8 -------- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/flush_workqueue-export.patch diff --git a/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch b/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch deleted file mode 100644 index 17583e317306..000000000000 --- a/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index 4c4f061..a413acb 100644 ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c -@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq) - out_unlock: - mutex_unlock(&wq->mutex); - } --EXPORT_SYMBOL_GPL(flush_workqueue); -+EXPORT_SYMBOL(flush_workqueue); - - /** - * drain_workqueue - drain a workqueue diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index 7584f69937d5..56914ae9cdec 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -14,12 +14,4 @@ import ./generic.nix (args // rec { features.needsCifsUtils = true; features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; - - # cherry-pick from upstream to resolve a licensing problem that prevents - # compiling the broadcom-sta wireless driver on kernels >= 4.2 - # see: https://github.com/longsleep/bcmwl-ubuntu/issues/6 - kernelPatches = [ { - name = "flush-workqueue-export"; - patch = ./flush_workqueue-export.patch; - } ]; } // (args.argsOverride or {})) From 30cd66910ed3546ee7d8ab7007598e408e998e7c Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Tue, 29 Sep 2015 21:18:23 -0700 Subject: [PATCH 11/44] netbeans: 7.4 -> 8.0.2 --- pkgs/applications/editors/netbeans/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 79dbb589d236..1f8d3f700eae 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -11,10 +11,10 @@ let }; in stdenv.mkDerivation { - name = "netbeans-7.4"; + name = "netbeans-8.0.2"; src = fetchurl { - url = http://download.netbeans.org/netbeans/7.4/final/zip/netbeans-7.4-201310111528.zip; - sha256 = "0nrnghnsdix5cmp86xi1gmvarhjk2k8mlbld3dfa9impm8gpv6mx"; + url = http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905.zip; + sha256 = "1h9cqpwsnrhcnn4fqz3rr4s5jln8cfwki8af9zikq9j6aza337xv"; }; buildCommand = '' # Unpack and copy the stuff From eaddd4e5e8defd2db8dac35d910c2462177fe226 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Tue, 29 Sep 2015 22:03:02 -0700 Subject: [PATCH 12/44] netbeans: additional patching - Patches a new awk call in the Netbeans 8 launcher, to fix a warning on startup: /nix/store/...-netbeans-8.0.2/netbeans/platform/lib/nbexec: line 201: /usr/bin/awk: No such file or directory - Patches a bunch of sh/perl/python shebangs. --- .../applications/editors/netbeans/default.nix | 21 ++++++++++++------- pkgs/applications/editors/netbeans/path.patch | 11 ++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/editors/netbeans/path.patch diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 1f8d3f700eae..3ea0c71f125a 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, jdk, unzip, which, makeWrapper, makeDesktopItem}: +{ stdenv, fetchurl, makeWrapper, makeDesktopItem +, gawk, jdk, perl, python, unzip, which +}: let desktopItem = makeDesktopItem { @@ -16,14 +18,19 @@ stdenv.mkDerivation { url = http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905.zip; sha256 = "1h9cqpwsnrhcnn4fqz3rr4s5jln8cfwki8af9zikq9j6aza337xv"; }; + buildCommand = '' - # Unpack and copy the stuff + # Unpack and perform some path patching. unzip $src - mkdir -p $out - cp -a netbeans $out - - # Create a wrapper capable of starting it + patch -p1 <${./path.patch} + substituteInPlace netbeans/platform/lib/nbexec \ + --subst-var-by AWK ${gawk}/bin/awk + patchShebangs . + + # Copy to installation directory and create a wrapper capable of starting + # it. mkdir -p $out/bin + cp -a netbeans $out makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ --prefix PATH : ${jdk}/bin:${which}/bin \ --prefix JAVA_HOME : ${jdk.home} \ @@ -34,7 +41,7 @@ stdenv.mkDerivation { cp ${desktopItem}/share/applications/* $out/share/applications ''; - buildInputs = [ unzip makeWrapper ]; + buildInputs = [ makeWrapper perl python unzip ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; diff --git a/pkgs/applications/editors/netbeans/path.patch b/pkgs/applications/editors/netbeans/path.patch new file mode 100644 index 000000000000..57b5730e137c --- /dev/null +++ b/pkgs/applications/editors/netbeans/path.patch @@ -0,0 +1,11 @@ +--- a/netbeans/platform/lib/nbexec 2015-09-29 21:26:39.282600903 -0700 ++++ b/netbeans/platform/lib/nbexec 2015-09-29 21:26:58.977697858 -0700 +@@ -198,7 +198,7 @@ + SunOS*) awk=nawk ;; + *) awk=awk ;; + esac +- jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "/usr/bin/${awk}" -F '"' '/version/ {print substr($2, 1, 3)}') ++ jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "@AWK@" -F '"' '/version/ {print substr($2, 1, 3)}') + if [ "$jdk_version" = "1.7" ] ; then + jargs="$jargs $launcher_args" + fi From 5ed03241bee04a636e314b484be3f30ac14c4449 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 1 Feb 2014 21:20:48 -0430 Subject: [PATCH 13/44] texlive: Fix download file names to be current. --- pkgs/tools/typesetting/tex/texlive-new/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index 961fbc26ba47..c8b2a414fa31 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -129,7 +129,7 @@ let urlPrefix = args.urlPrefix or ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"); # beware: standard mirrors http://mirror.ctan.org/ don't have releases - mirror = "ftp://tug.ctan.org"; # also works: ftp.math.utah.edu but same IP + mirror = "http://ftp.math.utah.edu"; # ftp://tug.ctan.org no longer works, although same IP in '' tar -xf '${ fetchurl { inherit url md5; } }' \ '--strip-components=${toString stripPrefix}' \ From 40503a2eab2d503e572f9b53dcb6052d61055031 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Sep 2015 10:03:59 +0200 Subject: [PATCH 14/44] redshift: add hicolor_icon_theme dependency This fixes the icon-theme.cache collision by removing it during Fixup. --- pkgs/applications/misc/redshift/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 5f4120dae491..6e5404eb6861 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig , geoclue -, guiSupport ? true, gtk3, python, pygobject3, pyxdg +, guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg , drmSupport ? true, libdrm , randrSupport ? true, libxcb , vidModeSupport ? true, libX11, libXxf86vm @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; buildInputs = [ geoclue ] - ++ stdenv.lib.optionals guiSupport [ gtk3 python pygobject3 pyxdg ] + ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ] ++ stdenv.lib.optionals drmSupport [ libdrm ] ++ stdenv.lib.optionals randrSupport [ libxcb ] ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/redshift-gtk" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share" + --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share" ''; meta = with stdenv.lib; { From 96c1c16771798e538bff2401ad4e95b61c7097ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Sep 2015 19:29:24 +0200 Subject: [PATCH 15/44] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/d64ca94227781f00e309a03b72475f6fe4b8a035 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/8f14dec4319f0b88ba503221342e58f1fd3752dd - LTS Haskell: https://github.com/fpco/lts-haskell/commit/831a37566be736e827a8f17d6c006a09ed384cd6 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/e7fd25c827f2a1bfb13ea6e716579b697a566ac3 --- .../haskell-modules/configuration-lts-0.0.nix | 5 + .../haskell-modules/configuration-lts-0.1.nix | 5 + .../haskell-modules/configuration-lts-0.2.nix | 5 + .../haskell-modules/configuration-lts-0.3.nix | 5 + .../haskell-modules/configuration-lts-0.4.nix | 5 + .../haskell-modules/configuration-lts-0.5.nix | 5 + .../haskell-modules/configuration-lts-0.6.nix | 5 + .../haskell-modules/configuration-lts-0.7.nix | 5 + .../haskell-modules/configuration-lts-1.0.nix | 10 + .../haskell-modules/configuration-lts-1.1.nix | 10 + .../configuration-lts-1.10.nix | 10 + .../configuration-lts-1.11.nix | 10 + .../configuration-lts-1.12.nix | 10 + .../configuration-lts-1.13.nix | 10 + .../configuration-lts-1.14.nix | 10 + .../configuration-lts-1.15.nix | 10 + .../haskell-modules/configuration-lts-1.2.nix | 10 + .../haskell-modules/configuration-lts-1.4.nix | 10 + .../haskell-modules/configuration-lts-1.5.nix | 10 + .../haskell-modules/configuration-lts-1.7.nix | 10 + .../haskell-modules/configuration-lts-1.8.nix | 10 + .../haskell-modules/configuration-lts-1.9.nix | 10 + .../haskell-modules/configuration-lts-2.0.nix | 11 + .../haskell-modules/configuration-lts-2.1.nix | 11 + .../configuration-lts-2.10.nix | 11 + .../configuration-lts-2.11.nix | 12 + .../configuration-lts-2.12.nix | 12 + .../configuration-lts-2.13.nix | 12 + .../configuration-lts-2.14.nix | 12 + .../configuration-lts-2.15.nix | 12 + .../configuration-lts-2.16.nix | 12 + .../configuration-lts-2.17.nix | 12 + .../configuration-lts-2.18.nix | 12 + .../configuration-lts-2.19.nix | 12 + .../haskell-modules/configuration-lts-2.2.nix | 11 + .../configuration-lts-2.20.nix | 12 + .../configuration-lts-2.21.nix | 13 + .../configuration-lts-2.22.nix | 13 + .../haskell-modules/configuration-lts-2.3.nix | 11 + .../haskell-modules/configuration-lts-2.4.nix | 11 + .../haskell-modules/configuration-lts-2.5.nix | 11 + .../haskell-modules/configuration-lts-2.6.nix | 11 + .../haskell-modules/configuration-lts-2.7.nix | 11 + .../haskell-modules/configuration-lts-2.8.nix | 11 + .../haskell-modules/configuration-lts-2.9.nix | 11 + .../haskell-modules/configuration-lts-3.0.nix | 11 + .../haskell-modules/configuration-lts-3.1.nix | 11 + .../haskell-modules/configuration-lts-3.2.nix | 11 + .../haskell-modules/configuration-lts-3.3.nix | 11 + .../haskell-modules/configuration-lts-3.4.nix | 11 + .../haskell-modules/configuration-lts-3.5.nix | 11 + .../haskell-modules/configuration-lts-3.6.nix | 12 + .../haskell-modules/configuration-lts-3.7.nix | 13 + .../haskell-modules/hackage-packages.nix | 778 ++++++++++++++---- 54 files changed, 1177 insertions(+), 139 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 52955bcbcd5e..281a5156d195 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -1138,6 +1138,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1270,6 +1271,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -5722,6 +5724,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5771,6 +5774,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "opaleye" = dontDistribute super."opaleye"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7729,6 +7733,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index a8f1e0ea023a..df9302c9e1a3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -1138,6 +1138,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1270,6 +1271,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -5721,6 +5723,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5770,6 +5773,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "opaleye" = dontDistribute super."opaleye"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7728,6 +7732,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 05fa5846af5f..914535329048 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -1138,6 +1138,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1270,6 +1271,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -5721,6 +5723,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5770,6 +5773,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "opaleye" = dontDistribute super."opaleye"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7728,6 +7732,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 02d7e61e4b0d..4fa36f8b9fd2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -1138,6 +1138,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1270,6 +1271,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -5721,6 +5723,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5770,6 +5773,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "opaleye" = dontDistribute super."opaleye"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7728,6 +7732,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index d95d644e2f99..fae443d7eaf4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -1138,6 +1138,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1270,6 +1271,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -5718,6 +5720,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5767,6 +5770,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "opaleye" = dontDistribute super."opaleye"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7723,6 +7727,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 699462954c4d..e7f5dab9edf6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -1138,6 +1138,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1270,6 +1271,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -5718,6 +5720,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5767,6 +5770,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "opaleye" = dontDistribute super."opaleye"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7723,6 +7727,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index ac56637a3814..b803122a9698 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -1137,6 +1137,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1269,6 +1270,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -5713,6 +5715,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5762,6 +5765,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "opaleye" = dontDistribute super."opaleye"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7717,6 +7721,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 6e574ebeba9c..cf9b5b0d0f9d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -1137,6 +1137,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1269,6 +1270,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -5713,6 +5715,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5762,6 +5765,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "opaleye" = dontDistribute super."opaleye"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7717,6 +7721,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 68456dc0d1fa..11adef7fbbd6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -1133,6 +1133,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1265,6 +1266,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2595,11 +2597,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5696,6 +5703,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5745,6 +5753,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7696,6 +7705,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 732c5ae66e80..40ef48578e66 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -1133,6 +1133,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1264,6 +1265,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2589,11 +2591,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5682,6 +5689,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5731,6 +5739,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7677,6 +7686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 7ec3f2c8569d..3c9145c2aa85 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2582,11 +2584,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5654,6 +5661,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5703,6 +5711,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7636,6 +7645,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 70de753cb374..4b1be2d3b504 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2582,11 +2584,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5650,6 +5657,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5699,6 +5707,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7630,6 +7639,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index b32a0e3ff3f4..5333080d52dc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2582,11 +2584,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5649,6 +5656,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5698,6 +5706,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7627,6 +7636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 3b158a516132..7bb9c2b5c1e7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2581,11 +2583,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5646,6 +5653,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5695,6 +5703,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7623,6 +7632,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 5c1172780a75..58cd8ecf719d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -1131,6 +1131,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1262,6 +1263,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2578,11 +2580,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5639,6 +5646,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5688,6 +5696,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7614,6 +7623,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index b94d718285bb..cebc0e2797f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -1129,6 +1129,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1260,6 +1261,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2573,11 +2575,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5630,6 +5637,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5679,6 +5687,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7601,6 +7610,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 089ef7f6e98f..0e9d8d0cd0c0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -1133,6 +1133,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1264,6 +1265,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2587,11 +2589,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5679,6 +5686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5728,6 +5736,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7671,6 +7680,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 973eb125a0b9..daeb11e1c36d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2586,11 +2588,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5674,6 +5681,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5723,6 +5731,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7664,6 +7673,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index e254967f5ef5..9b5f97c3ad06 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2585,11 +2587,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5672,6 +5679,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5721,6 +5729,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7661,6 +7670,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 98df67366309..98f682abee87 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2584,11 +2586,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5665,6 +5672,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5714,6 +5722,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7654,6 +7663,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 2e51daf16bc4..4150c09f48bb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2584,11 +2586,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5660,6 +5667,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5709,6 +5717,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7648,6 +7657,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index fbc3b5d4c6f8..6844afe8d36d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -1132,6 +1132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1263,6 +1264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -2584,11 +2586,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5657,6 +5664,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5706,6 +5714,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7644,6 +7653,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 99bf0ec24a53..48c9f6abc619 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -1119,6 +1119,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1250,6 +1251,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1649,6 +1651,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2551,11 +2554,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5566,6 +5574,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5615,6 +5624,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7520,6 +7530,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 00eb193c3760..7f8381f798c4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -1119,6 +1119,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1250,6 +1251,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1649,6 +1651,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2550,11 +2553,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5564,6 +5572,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5613,6 +5622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7518,6 +7528,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index db644a966c9f..e2d0bffa7549 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -1113,6 +1113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1244,6 +1245,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1639,6 +1641,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2531,11 +2534,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5515,6 +5523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5564,6 +5573,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7441,6 +7451,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index c1cc44158300..db328b6c7feb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -1113,6 +1113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1243,6 +1244,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1638,6 +1640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2530,11 +2533,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5507,6 +5515,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5556,6 +5565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7428,6 +7438,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7839,6 +7850,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 5234e5ba1e25..52649aa0049d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -1113,6 +1113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1243,6 +1244,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1638,6 +1640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2530,11 +2533,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5507,6 +5515,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5556,6 +5565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7427,6 +7437,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7838,6 +7849,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 40a0da8d0f64..9092f8cb3a34 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -1113,6 +1113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1243,6 +1244,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1638,6 +1640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2530,11 +2533,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5504,6 +5512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5553,6 +5562,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7423,6 +7433,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7834,6 +7845,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 05a43fae7db0..9e8e784ba297 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -1113,6 +1113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1242,6 +1243,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1637,6 +1639,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2529,11 +2532,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5501,6 +5509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5550,6 +5559,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7418,6 +7428,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7828,6 +7839,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 2f6ee55f2f18..738b1b84c432 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -1113,6 +1113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1242,6 +1243,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1637,6 +1639,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2529,10 +2532,15 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; @@ -5495,6 +5503,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5544,6 +5553,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7411,6 +7421,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7821,6 +7832,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index cc00920f8b2a..8eb2bbab2b25 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -1111,6 +1111,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1240,6 +1241,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1635,6 +1637,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2524,10 +2527,15 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; @@ -5484,6 +5492,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5533,6 +5542,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7398,6 +7408,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7808,6 +7819,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index f40190489131..0a74d6dc1b2e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -1111,6 +1111,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1240,6 +1241,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1633,6 +1635,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2521,10 +2524,15 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; @@ -5474,6 +5482,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5523,6 +5532,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7386,6 +7396,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7794,6 +7805,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index cc979aa8165d..48cfbb2a5ace 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -1110,6 +1110,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1239,6 +1240,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1631,6 +1633,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2516,10 +2519,15 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; @@ -5464,6 +5472,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5513,6 +5522,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7374,6 +7384,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7781,6 +7792,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 5eb6aa2e539e..2a769e0ca465 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -1110,6 +1110,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1239,6 +1240,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1631,6 +1633,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2516,10 +2519,15 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; @@ -5461,6 +5469,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5510,6 +5519,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7369,6 +7379,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7776,6 +7787,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 33727046ccd8..0092d319cd8d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -1118,6 +1118,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1249,6 +1250,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1648,6 +1650,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2547,11 +2550,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5560,6 +5568,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5609,6 +5618,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7513,6 +7523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 5afea2a26112..4d419a37c242 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -1110,6 +1110,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1239,6 +1240,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1631,6 +1633,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2513,10 +2516,15 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; @@ -5456,6 +5464,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5505,6 +5514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7362,6 +7372,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7768,6 +7779,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 4584cdf1e11a..9fc268d12129 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -1110,6 +1110,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1239,6 +1240,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1626,10 +1628,12 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2512,10 +2516,15 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; @@ -5453,6 +5462,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5502,6 +5512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7355,6 +7366,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7759,6 +7771,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 8ac9a8422907..5ff66696ad83 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -1109,6 +1109,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1238,6 +1239,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1625,10 +1627,12 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2511,10 +2515,15 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_4"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; @@ -5449,6 +5458,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5498,6 +5508,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7351,6 +7362,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7755,6 +7767,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 12045159cd6a..cea6010f9d58 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -1118,6 +1118,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1249,6 +1250,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1648,6 +1650,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2547,11 +2550,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5557,6 +5565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5606,6 +5615,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7509,6 +7519,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index f5ec04d075c2..e8a136108158 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -1118,6 +1118,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1249,6 +1250,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1647,6 +1649,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2546,11 +2549,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5554,6 +5562,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5603,6 +5612,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7502,6 +7512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 18f62b491dc0..5486871c5a41 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -1118,6 +1118,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1249,6 +1250,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1647,6 +1649,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2544,11 +2547,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5551,6 +5559,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5600,6 +5609,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7498,6 +7508,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 4e9c87861571..127d1d9b8ebb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -1116,6 +1116,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1247,6 +1248,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1644,6 +1646,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2540,11 +2543,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5544,6 +5552,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5593,6 +5602,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7489,6 +7499,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index d12eb6323d8d..235c326a920d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -1114,6 +1114,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1245,6 +1246,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1642,6 +1644,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2538,11 +2541,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5542,6 +5550,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5591,6 +5600,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7487,6 +7497,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index d52d0fa060f9..c7a910294272 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -1113,6 +1113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1244,6 +1245,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1641,6 +1643,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2536,11 +2539,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5537,6 +5545,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5586,6 +5595,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7477,6 +7487,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index d0b4d4799fda..ae53152af1f4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -1113,6 +1113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_7_4"; @@ -1244,6 +1245,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "angel" = dontDistribute super."angel"; "animalcase" = dontDistribute super."animalcase"; @@ -1639,6 +1641,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; @@ -2533,11 +2536,16 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2"; + "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1"; + "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_2_0"; + "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; + "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; @@ -5527,6 +5535,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5576,6 +5585,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "opaleye" = doDistribute super."opaleye_0_3_1_2"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -7460,6 +7470,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; "tuples-homogenous-h98" = dontDistribute super."tuples-homogenous-h98"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 2286b42938e2..1e95a694c7bf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -1081,6 +1081,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-qq" = doDistribute super."aeson-qq_0_8_0"; @@ -1208,6 +1209,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "animalcase" = dontDistribute super."animalcase"; "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; @@ -1566,10 +1568,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2373,6 +2377,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_0"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -3301,6 +3306,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = doDistribute super."hakyll_4_7_2_3"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -5216,6 +5222,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5263,6 +5270,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "opaleye" = doDistribute super."opaleye_0_4_0_0"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -5441,6 +5449,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; + "persistent" = doDistribute super."persistent_2_2"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; @@ -7038,6 +7047,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tuple-morph" = dontDistribute super."tuple-morph"; "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7419,6 +7429,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index ed9a9794a78c..6ebfcc67b630 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -1080,6 +1080,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; @@ -1206,6 +1207,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "animalcase" = dontDistribute super."animalcase"; "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; @@ -1563,10 +1565,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2370,6 +2374,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_0"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -3295,6 +3300,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = doDistribute super."hakyll_4_7_2_3"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -5207,6 +5213,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5254,6 +5261,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "opaleye" = doDistribute super."opaleye_0_4_0_0"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -5432,6 +5440,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; + "persistent" = doDistribute super."persistent_2_2"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; @@ -7027,6 +7036,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tuple-morph" = dontDistribute super."tuple-morph"; "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7407,6 +7417,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 51ad26aa14dc..fe08c0a30f01 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -1077,6 +1077,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; @@ -1203,6 +1204,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "animalcase" = dontDistribute super."animalcase"; "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; @@ -1559,10 +1561,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2366,6 +2370,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_0"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -3288,6 +3293,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = doDistribute super."hakyll_4_7_2_3"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -5197,6 +5203,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5244,6 +5251,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "opaleye" = doDistribute super."opaleye_0_4_0_0"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -5422,6 +5430,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; + "persistent" = doDistribute super."persistent_2_2"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; @@ -7008,6 +7017,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tuple-morph" = dontDistribute super."tuple-morph"; "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7386,6 +7396,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index c942545e6d58..2939f338b83a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -1076,6 +1076,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; @@ -1202,6 +1203,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "animalcase" = dontDistribute super."animalcase"; "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; @@ -1557,10 +1559,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2360,6 +2364,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_0"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -3281,6 +3286,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = doDistribute super."hakyll_4_7_2_3"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -5185,6 +5191,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5232,6 +5239,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "opaleye" = doDistribute super."opaleye_0_4_0_0"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -5410,6 +5418,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; + "persistent" = doDistribute super."persistent_2_2"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; @@ -6992,6 +7001,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tuple-morph" = dontDistribute super."tuple-morph"; "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7369,6 +7379,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 025ea1d0e240..6bf6d6ef81fd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -1076,6 +1076,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; @@ -1202,6 +1203,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "animalcase" = dontDistribute super."animalcase"; "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; @@ -1557,10 +1559,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2359,6 +2363,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_0"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -3280,6 +3285,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = doDistribute super."hakyll_4_7_2_3"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -5184,6 +5190,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5230,6 +5237,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "oo-prototypes" = dontDistribute super."oo-prototypes"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -5408,6 +5416,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; + "persistent" = doDistribute super."persistent_2_2"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; @@ -6987,6 +6996,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tuple-morph" = dontDistribute super."tuple-morph"; "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7363,6 +7373,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 2961ad93bcaa..83ceef218fd9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -1075,6 +1075,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; @@ -1201,6 +1202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "animalcase" = dontDistribute super."animalcase"; "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; @@ -1555,10 +1557,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2355,6 +2359,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_0"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -3273,6 +3278,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = doDistribute super."hakyll_4_7_2_3"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -5168,6 +5174,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5214,6 +5221,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "oo-prototypes" = dontDistribute super."oo-prototypes"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -5391,6 +5399,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; + "persistent" = doDistribute super."persistent_2_2"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; @@ -6961,6 +6970,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tuple-morph" = dontDistribute super."tuple-morph"; "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7336,6 +7346,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 82d8471e55bd..617053713675 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -1073,6 +1073,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; @@ -1199,6 +1200,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "animalcase" = dontDistribute super."animalcase"; "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; @@ -1552,10 +1554,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2322,6 +2326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dia-functions" = dontDistribute super."dia-functions"; "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_6"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; @@ -2348,6 +2353,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_0"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -3259,6 +3265,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = doDistribute super."hakyll_4_7_2_3"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -5144,6 +5151,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5190,6 +5198,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "oo-prototypes" = dontDistribute super."oo-prototypes"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -5367,6 +5376,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; + "persistent" = doDistribute super."persistent_2_2"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; @@ -6931,6 +6941,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tuple-morph" = dontDistribute super."tuple-morph"; "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7303,6 +7314,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index ff7bd4a42f41..02dece85d138 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -1071,6 +1071,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; @@ -1197,6 +1198,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "anansi-hscolour" = dontDistribute super."anansi-hscolour"; "anansi-pandoc" = dontDistribute super."anansi-pandoc"; "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; "android-lint-summary" = dontDistribute super."android-lint-summary"; "animalcase" = dontDistribute super."animalcase"; "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; @@ -1544,10 +1546,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_0"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -2303,6 +2307,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_6"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; @@ -2324,6 +2329,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_0"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -3232,6 +3238,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = doDistribute super."hakyll_4_7_2_3"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -5110,6 +5117,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; "numeric-limits" = dontDistribute super."numeric-limits"; "numeric-prelude" = dontDistribute super."numeric-prelude"; "numeric-qq" = dontDistribute super."numeric-qq"; @@ -5156,6 +5164,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "oo-prototypes" = dontDistribute super."oo-prototypes"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; "open-browser" = dontDistribute super."open-browser"; "open-pandoc" = dontDistribute super."open-pandoc"; "open-symbology" = dontDistribute super."open-symbology"; @@ -5331,6 +5340,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; + "persistent" = doDistribute super."persistent_2_2"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; @@ -6503,6 +6513,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_2"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -6879,6 +6890,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tuple-morph" = dontDistribute super."tuple-morph"; "tuple-th" = dontDistribute super."tuple-th"; "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; "turing-music" = dontDistribute super."turing-music"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; "turni" = dontDistribute super."turni"; @@ -7248,6 +7260,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_5_0"; "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 550935ca5e56..da776308cbf7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3347,8 +3347,8 @@ self: { ({ mkDerivation, base, ghc, haskell-src-exts }: mkDerivation { pname = "CoreDump"; - version = "0.1.0.0"; - sha256 = "367543d0952dc1a8dd9dc0cae94c37102708a2db4c1fe329fd95c724eca63b75"; + version = "0.1.0.1"; + sha256 = "dfa9a8c9e727949a1b9b4d7031dbabafbdf44142ef7f01883428724b72e73dcf"; libraryHaskellDepends = [ base ghc haskell-src-exts ]; description = "A GHC plugin for printing GHC's internal Core data structures"; license = stdenv.lib.licenses.bsd3; @@ -5989,6 +5989,7 @@ self: { homepage = "http://github.com/sordina/GLM"; description = "Simple Gridlab-D GLM parser and utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GLMatrix" = callPackage @@ -6186,6 +6187,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "GPipe_2_1_1" = callPackage + ({ mkDerivation, base, Boolean, containers, exception-transformers + , gl, hashtables, linear, transformers + }: + mkDerivation { + pname = "GPipe"; + version = "2.1.1"; + sha256 = "5af935da8bcf914b8b72d8b073733f8b60571bece9781caa1189281c58378e30"; + libraryHaskellDepends = [ + base Boolean containers exception-transformers gl hashtables linear + transformers + ]; + homepage = "http://tobbebex.blogspot.se/"; + description = "Typesafe functional GPU graphics programming"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GPipe-Collada" = callPackage ({ mkDerivation, array, base, containers, GPipe, HaXml, mtl, Vec }: mkDerivation { @@ -6455,6 +6474,7 @@ self: { homepage = "https://github.com/choener/GenussFold"; description = "MCFGs for Genus-1 RNA Pseudoknots"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "GeoIp" = callPackage @@ -12652,6 +12672,7 @@ self: { jailbreak = true; description = "NTRU Cryptography"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "NXT" = callPackage @@ -17851,8 +17872,8 @@ self: { pname = "UTFTConverter"; version = "0.1.0.0"; sha256 = "5679130800bbb11e3a67ab638e97e733b4824edff8b8a6b2e88b7daaf56b934e"; - revision = "6"; - editedCabalFile = "28faa6c4e8e0e24ecf2399e76ff68adac8c493eb7b94430da84aaf6eb57821ff"; + revision = "8"; + editedCabalFile = "a787e368d195b091b26df9422117495772cfa008d7011a25ae2e6a49d2bfbe17"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17973,8 +17994,8 @@ self: { }: mkDerivation { pname = "VKHS"; - version = "0.5.5"; - sha256 = "7c7e8d1b89c2fb53f8c382939f49249ee13a188c21907bcd4cebc9b21e01948d"; + version = "0.5.7"; + sha256 = "89cb9291667358d2df2fb86e1cb87fef42ebfbd410e31222d8b3d90199df72cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18160,6 +18181,7 @@ self: { jailbreak = true; description = "WebMoney authentication module"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "WURFL" = callPackage @@ -20939,6 +20961,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-extra" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , exceptions, hashable, quickcheck-instances, scientific, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-extra"; + version = "0.2.0.0"; + sha256 = "0c30a45f493d887247dc4c2935a4e288de35457e12c20f51944171456ca38dcd"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions hashable + scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + text unordered-containers vector + ]; + homepage = "https://github.com/phadej/aeson-extra#readme"; + description = "Extra goodies for aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-lens" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, lens, text , unordered-containers, vector @@ -22423,6 +22468,28 @@ self: { license = "unknown"; }) {}; + "amazonka_1_3_2_1" = callPackage + ({ mkDerivation, amazonka-core, base, bytestring, conduit + , conduit-extra, directory, exceptions, http-conduit, ini, lens + , mmorph, monad-control, mtl, resourcet, retry, tasty, tasty-hunit + , text, time, transformers, transformers-base, transformers-compat + }: + mkDerivation { + pname = "amazonka"; + version = "1.3.2.1"; + sha256 = "a2f3f3c3f3c5ddbfbfb2b988aa293e620bf03afd0776bbcd01a25a955e882704"; + libraryHaskellDepends = [ + amazonka-core base bytestring conduit conduit-extra directory + exceptions http-conduit ini lens mmorph monad-control mtl resourcet + retry text time transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Comprehensive Amazon Web Services SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "amazonka-autoscaling_0_3_3" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { @@ -23666,6 +23733,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-ecs_0_3_3" = callPackage @@ -24556,6 +24624,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-redshift_0_3_3" = callPackage @@ -24810,6 +24879,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-sdb_0_3_3" = callPackage @@ -25050,6 +25120,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-ssm_0_3_3" = callPackage @@ -25350,6 +25421,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-test" = callPackage @@ -25687,6 +25759,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "android" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "android"; + version = "0.0.2"; + sha256 = "85b112bebb356f4def496e61421651b9e81060af8cab107dbadaf075ae9ac0f2"; + libraryHaskellDepends = [ base process ]; + homepage = "https://github.com/keera-studios/android-haskell"; + description = "Android methods exposed to Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "android-lint-summary" = callPackage ({ mkDerivation, base, basic-prelude, data-default, directory , filemanip, hspec, hxt, lens, mtl, optparse-applicative @@ -27381,6 +27465,7 @@ self: { ]; description = "Natural number arithmetic"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "arithmoi_0_4_1_1" = callPackage @@ -27439,6 +27524,7 @@ self: { homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "armada" = callPackage @@ -32276,8 +32362,8 @@ self: { pname = "binary-orphans"; version = "0.1.1.0"; sha256 = "a34b6ea3a5485859c3d83aa6d1e4535e05590ef543d01482beba757db1d14431"; - revision = "2"; - editedCabalFile = "1a7c9d712f0bacd638ea86d1fe3b0cd7a63af45a272f58ce704b88e9640c3067"; + revision = "3"; + editedCabalFile = "7c3abcc503031ccbe6c876008c89ffef8f579777949438d2002936e274ee9359"; libraryHaskellDepends = [ aeson base binary hashable scientific tagged text text-binary time unordered-containers vector vector-binary-instances @@ -33556,8 +33642,8 @@ self: { }: mkDerivation { pname = "bit-array"; - version = "0.1.0"; - sha256 = "da4ee4274cc46ebab0fa3e5007e5d785a8fd318f848273a136098c3a726e046c"; + version = "0.1.0.1"; + sha256 = "b5a9b1bbc449b4b189e8485a1220364e7f7ff113d9c265ca4b5a7c287f1a25e3"; libraryHaskellDepends = [ base loch-th numeric-qq placeholders ]; testHaskellDepends = [ base directory doctest filepath ]; jailbreak = true; @@ -33582,6 +33668,7 @@ self: { homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "bitarray" = callPackage @@ -34415,7 +34502,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blaze-html" = callPackage + "blaze-html_0_8_1_0" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -34435,9 +34522,10 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blaze-html_0_8_1_1" = callPackage + "blaze-html" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -34457,7 +34545,6 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-html-contrib" = callPackage @@ -34595,7 +34682,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blaze-markup" = callPackage + "blaze-markup_0_7_0_2" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text @@ -34612,9 +34699,10 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blaze-markup_0_7_0_3" = callPackage + "blaze-markup" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text @@ -34631,7 +34719,6 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-shields" = callPackage @@ -35849,6 +35936,7 @@ self: { homepage = "https://github.com/chadaustin/buffer-builder"; description = "Library for efficiently building up buffers, one piece at a time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "buffer-builder-aeson" = callPackage @@ -35873,6 +35961,7 @@ self: { jailbreak = true; description = "Serialize Aeson values with Data.BufferBuilder"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "bugzilla" = callPackage @@ -38665,6 +38754,7 @@ self: { homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caldims" = callPackage @@ -40203,6 +40293,7 @@ self: { ]; description = "Parser for categorial grammars"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "cgen" = callPackage @@ -40278,8 +40369,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "6.5.5"; - sha256 = "a886c6a406a6d0f371457536616ebc67bed0f03f2419e72e11412d3d0b41c828"; + version = "6.5.6"; + sha256 = "f29b3909944fc13b5563bcbb32aa3970cf70e6dadfd7253e5934e4bfca6e0f35"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40520,8 +40611,8 @@ self: { }: mkDerivation { pname = "chatter"; - version = "0.7.0.0"; - sha256 = "c3078e28309432207e18a041a124916dfd07a2a3fbb1dae00563f2c3336af324"; + version = "0.8.0.0"; + sha256 = "ce18c6bf22f292824e171746ef46edf950a44d3dba1036c7971ce77aaadb109c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44932,6 +45023,7 @@ self: { homepage = "https://github.com/liamoc/composition-tree"; description = "Composition trees for arbitrary monoids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compressed" = callPackage @@ -46632,6 +46724,7 @@ self: { homepage = "http://andersk.mit.edu/haskell/constructible/"; description = "Exact computation with constructible real numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "constructive-algebra" = callPackage @@ -49712,8 +49805,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "4.8.3"; - sha256 = "389f8ab64f76da31fdc553c64017e0653c539ed38f128707b3e037f260327c99"; + version = "4.8.4"; + sha256 = "e9533d4675c8991b5ab072e5259055e55a05a95f43be4baab0d8473e254c4741"; libraryHaskellDepends = [ base Boolean colour csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -49727,15 +49820,15 @@ self: { "csound-expression-dynamic" = callPackage ({ mkDerivation, array, base, Boolean, containers, data-default - , data-fix, data-fix-cse, transformers, wl-pprint + , data-fix, data-fix-cse, hashable, transformers, wl-pprint }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.1.4.3"; - sha256 = "3cdf9e97f0ab25e9769d352a694dbf8ad1bb942e3aef6f7821fac8d31054eee7"; + version = "0.1.5"; + sha256 = "65a80a536d28e5e8b55e3aed7121df88635636a5b337f7706301a319edbcf80c"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse - transformers wl-pprint + hashable transformers wl-pprint ]; homepage = "https://github.com/anton-k/csound-expression-dynamic"; description = "dynamic core for csound-expression library"; @@ -49760,15 +49853,16 @@ self: { "csound-expression-typed" = callPackage ({ mkDerivation, base, Boolean, colour, containers , csound-expression-dynamic, data-default, deepseq, ghc-prim - , temporal-media, transformers, wl-pprint + , hashable, temporal-media, transformers, wl-pprint }: mkDerivation { pname = "csound-expression-typed"; - version = "0.0.7.9.1"; - sha256 = "e9b15c6004709eba9472cce3f0d0af69a35cbae55d99ad9112080a1e201dfb73"; + version = "0.0.8"; + sha256 = "867a228cf36b5918a896451310177c82d618bb21d810aed5f7e41d56648929fa"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic - data-default deepseq ghc-prim temporal-media transformers wl-pprint + data-default deepseq ghc-prim hashable temporal-media transformers + wl-pprint ]; homepage = "https://github.com/anton-k/csound-expression-typed"; description = "typed core for the library csound-expression"; @@ -50404,6 +50498,7 @@ self: { jailbreak = true; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "cypher" = callPackage @@ -52177,6 +52272,7 @@ self: { homepage = "https://github.com/iand675/datadog"; description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "dataenc" = callPackage @@ -54477,6 +54573,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-cairo_1_3_0_5" = callPackage + ({ mkDerivation, base, bytestring, cairo, colour, containers + , data-default-class, diagrams-core, diagrams-lib, filepath + , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango + , split, statestack, transformers, unix, vector + }: + mkDerivation { + pname = "diagrams-cairo"; + version = "1.3.0.5"; + sha256 = "9d83fbdc43e09d9041ae7fc80dc5ad1e9906fd44bc06d9717d49f376cd6933d5"; + libraryHaskellDepends = [ + base bytestring cairo colour containers data-default-class + diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl + optparse-applicative pango split statestack transformers unix + vector + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Cairo backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-canvas_0_3_0_3" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl @@ -54684,7 +54802,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-contrib" = callPackage + "diagrams-contrib_1_3_0_6" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , data-default, data-default-class, diagrams-core, diagrams-lib , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom @@ -54709,9 +54827,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-contrib_1_3_0_7" = callPackage + "diagrams-contrib" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , data-default, data-default-class, diagrams-core, diagrams-lib , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom @@ -54736,7 +54855,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core_1_2_0_4" = callPackage @@ -55060,6 +55178,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-html5_1_3_0_4" = callPackage + ({ mkDerivation, base, cmdargs, containers, data-default-class + , diagrams-core, diagrams-lib, lens, mtl, NumInstances + , optparse-applicative, split, statestack, static-canvas, text + }: + mkDerivation { + pname = "diagrams-html5"; + version = "1.3.0.4"; + sha256 = "8dcc7134f3b9e3ca7816afe77d6da881e5aee400d91349b0f0af35faac14bfeb"; + libraryHaskellDepends = [ + base cmdargs containers data-default-class diagrams-core + diagrams-lib lens mtl NumInstances optparse-applicative split + statestack static-canvas text + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "HTML5 canvas backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-lib_1_2_0_7" = callPackage ({ mkDerivation, active, array, base, colour, containers , data-default-class, diagrams-core, dual-tree, filepath @@ -55156,7 +55294,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-lib_1_3_0_5" = callPackage + "diagrams-lib_1_3_0_6" = callPackage ({ mkDerivation, active, adjunctions, array, base, colour , containers, data-default-class, diagrams-core, diagrams-solve , directory, distributive, dual-tree, exceptions, filepath @@ -55166,8 +55304,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.3.0.5"; - sha256 = "3d9ba512e70a146b705f5cce092f7be0dfad3e71c9b2ffd651a0530f5214b785"; + version = "1.3.0.6"; + sha256 = "708ba36525cea74cc12f710da6ee466dc17b60b31f402424cae43fb9c1908b0a"; libraryHaskellDepends = [ active adjunctions array base colour containers data-default-class diagrams-core diagrams-solve directory distributive dual-tree @@ -55229,8 +55367,8 @@ self: { }: mkDerivation { pname = "diagrams-pgf"; - version = "0.1.0.2"; - sha256 = "328384a35db52342b889d05c334c5f101fbdc82778e9dde6ed77533b48c89cd3"; + version = "0.1.0.3"; + sha256 = "15148b7e985025fcee125086c13610de1b927b7c4dfcf5d8e6674f6844290641"; libraryHaskellDepends = [ base bytestring bytestring-builder colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels mtl @@ -55448,6 +55586,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-rasterific_1_3_1_5" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable + , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split + , unix + }: + mkDerivation { + pname = "diagrams-rasterific"; + version = "1.3.1.5"; + sha256 = "0fe3d7a6b4d5140aece80a35d9cbf54cc7a2712f45b8792758e340cfa4636c10"; + libraryHaskellDepends = [ + base bytestring containers data-default-class diagrams-core + diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl + optparse-applicative Rasterific split unix + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Rasterific backend for diagrams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-rubiks-cube" = callPackage ({ mkDerivation, base, data-default-class, diagrams-lib, lens }: mkDerivation { @@ -55590,6 +55749,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-svg_1_3_1_6" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, colour + , containers, diagrams-core, diagrams-lib, directory, filepath + , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl + , old-time, optparse-applicative, process, semigroups, split, text + , time + }: + mkDerivation { + pname = "diagrams-svg"; + version = "1.3.1.6"; + sha256 = "b04dcae8074aea84240dfd8d1776a783c51f46bc372582f025490e95cb88f83f"; + libraryHaskellDepends = [ + base base64-bytestring bytestring colour containers diagrams-core + diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg + monoid-extras mtl old-time optparse-applicative process semigroups + split text time + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "SVG backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-tikz" = callPackage ({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }: mkDerivation { @@ -55933,7 +56115,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors" = callPackage + "digestive-functors_0_8_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl , old-locale, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text, time @@ -55953,9 +56135,10 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors_0_8_0_1" = callPackage + "digestive-functors" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl , old-locale, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text, time @@ -55975,7 +56158,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-aeson" = callPackage @@ -56771,14 +56953,13 @@ self: { }: mkDerivation { pname = "distributed-process"; - version = "0.5.5"; - sha256 = "c58d861b199fcf1b76516c781805ba76b91b4ceeeb415d53d74031c49ce57270"; + version = "0.5.5.1"; + sha256 = "63a196d159ab18988c245b537b2099d5d7f85611b17593ef02271a478de34955"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static ghc-prim hashable mtl network-transport random rank1dynamic stm syb template-haskell time transformers ]; - jailbreak = true; homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -56869,7 +57050,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "distributed-process-client-server" = callPackage + "distributed-process-client-server_0_1_2" = callPackage ({ mkDerivation, ansi-terminal, base, binary, containers , data-accessor, deepseq, distributed-process , distributed-process-async, distributed-process-extras @@ -56902,7 +57083,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "distributed-process-execution" = callPackage + "distributed-process-client-server" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, containers + , data-accessor, deepseq, distributed-process + , distributed-process-async, distributed-process-extras + , distributed-process-tests, fingertree, ghc-prim, hashable, HUnit + , mtl, network, network-transport, network-transport-tcp, rematch + , stm, test-framework, test-framework-hunit, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "distributed-process-client-server"; + version = "0.1.3.1"; + sha256 = "3659dcf407af66485cc01294af61655aef48fd6758191788596b1461eed41438"; + libraryHaskellDepends = [ + base binary containers data-accessor deepseq distributed-process + distributed-process-async distributed-process-extras fingertree + hashable mtl stm time transformers unordered-containers + ]; + testHaskellDepends = [ + ansi-terminal base binary containers deepseq distributed-process + distributed-process-async distributed-process-extras + distributed-process-tests fingertree ghc-prim HUnit mtl network + network-transport network-transport-tcp rematch stm test-framework + test-framework-hunit transformers + ]; + homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; + description = "The Cloud Haskell Application Platform"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "distributed-process-execution_0_1_1" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , containers, data-accessor, deepseq, distributed-process , distributed-process-client-server, distributed-process-extras @@ -56938,7 +57150,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "distributed-process-extras" = callPackage + "distributed-process-execution" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, bytestring + , containers, data-accessor, deepseq, distributed-process + , distributed-process-client-server, distributed-process-extras + , distributed-process-supervisor, distributed-process-tests + , distributed-static, fingertree, ghc-prim, hashable, HUnit, mtl + , network, network-transport, network-transport-tcp, QuickCheck + , rematch, stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "distributed-process-execution"; + version = "0.1.2.1"; + sha256 = "2e450d510586384d325479d008a64254ad5c9883f8af6bfd99e7edc9ae26a68e"; + libraryHaskellDepends = [ + base binary containers data-accessor deepseq distributed-process + distributed-process-client-server distributed-process-extras + distributed-process-supervisor fingertree hashable mtl stm time + transformers unordered-containers + ]; + testHaskellDepends = [ + ansi-terminal base binary bytestring containers data-accessor + deepseq distributed-process distributed-process-extras + distributed-process-tests distributed-static fingertree ghc-prim + hashable HUnit mtl network network-transport network-transport-tcp + QuickCheck rematch stm test-framework test-framework-hunit + test-framework-quickcheck2 time transformers unordered-containers + ]; + homepage = "http://github.com/haskell-distributed/distributed-process-execution"; + description = "Execution Framework for The Cloud Haskell Application Platform"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "distributed-process-extras_0_2_0" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , containers, data-accessor, deepseq, distributed-process , distributed-process-tests, distributed-static, fingertree @@ -56971,6 +57218,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-extras" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, bytestring + , containers, data-accessor, deepseq, distributed-process + , distributed-process-tests, distributed-static, fingertree + , ghc-prim, hashable, HUnit, mtl, network, network-transport + , network-transport-tcp, QuickCheck, rematch, stm, test-framework + , test-framework-hunit, test-framework-quickcheck2, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "distributed-process-extras"; + version = "0.2.1.1"; + sha256 = "32213a9077c0fc3b835b7b94d7d5e04262208e2ce0192675af8b5bf9efe8f911"; + libraryHaskellDepends = [ + base binary containers data-accessor deepseq distributed-process + fingertree hashable mtl stm time transformers unordered-containers + ]; + testHaskellDepends = [ + ansi-terminal base binary bytestring containers data-accessor + deepseq distributed-process distributed-process-tests + distributed-static fingertree ghc-prim hashable HUnit mtl network + network-transport network-transport-tcp QuickCheck rematch stm + test-framework test-framework-hunit test-framework-quickcheck2 time + transformers unordered-containers + ]; + homepage = "http://github.com/haskell-distributed/distributed-process-extras"; + description = "Cloud Haskell Extras"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "distributed-process-monad-control" = callPackage ({ mkDerivation, base, distributed-process, monad-control , transformers, transformers-base @@ -57054,8 +57332,8 @@ self: { }: mkDerivation { pname = "distributed-process-registry"; - version = "0.1.0"; - sha256 = "82c38393081a97b6a8ffa99c196cad3ba570ba90ae87b04601313a0d4e2f4a30"; + version = "0.1.0.1"; + sha256 = "9571f9870fb0591a09b8260e4b8b096547bf253a502a4a9347c9c30f19788931"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-client-server distributed-process-extras @@ -57070,7 +57348,6 @@ self: { stm test-framework test-framework-hunit time transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/haskell-distributed/distributed-process-registry"; description = "Cloud Haskell Extended Process Registry"; license = stdenv.lib.licenses.bsd3; @@ -57122,7 +57399,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "distributed-process-supervisor" = callPackage + "distributed-process-supervisor_0_1_2" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , containers, data-accessor, deepseq, distributed-process , distributed-process-client-server, distributed-process-extras @@ -57156,7 +57433,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "distributed-process-task" = callPackage + "distributed-process-supervisor" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, bytestring + , containers, data-accessor, deepseq, distributed-process + , distributed-process-client-server, distributed-process-extras + , distributed-static, fingertree, ghc-prim, hashable, HUnit, mtl + , network, network-transport, network-transport-tcp, rematch, stm + , test-framework, test-framework-hunit, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "distributed-process-supervisor"; + version = "0.1.3.1"; + sha256 = "2e404f040d1a835b6dd77b4888b5d884f45dfda309dcdc04fcaa6988bf1a4786"; + libraryHaskellDepends = [ + base binary containers data-accessor deepseq distributed-process + distributed-process-client-server distributed-process-extras + fingertree hashable mtl stm time transformers unordered-containers + ]; + testHaskellDepends = [ + ansi-terminal base binary bytestring containers data-accessor + deepseq distributed-process distributed-process-client-server + distributed-process-extras distributed-static fingertree ghc-prim + hashable HUnit mtl network network-transport network-transport-tcp + rematch stm test-framework test-framework-hunit time transformers + unordered-containers + ]; + homepage = "http://github.com/haskell-distributed/distributed-process-supervisor"; + description = "Supervisors for The Cloud Haskell Application Platform"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "distributed-process-task_0_1_1" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , containers, data-accessor, deepseq, distributed-process , distributed-process-async, distributed-process-client-server @@ -57193,27 +57502,62 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-task" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, bytestring + , containers, data-accessor, deepseq, distributed-process + , distributed-process-async, distributed-process-client-server + , distributed-process-extras, distributed-process-tests + , distributed-static, fingertree, ghc-prim, hashable, HUnit, mtl + , network, network-transport, network-transport-tcp, QuickCheck + , rematch, stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "distributed-process-task"; + version = "0.1.2.1"; + sha256 = "f8dc728ba039c85feae5fd795d22d51aa2c1b7031ad99a772facccad22ae5619"; + libraryHaskellDepends = [ + base binary containers data-accessor deepseq distributed-process + distributed-process-async distributed-process-client-server + distributed-process-extras fingertree hashable mtl stm time + transformers unordered-containers + ]; + testHaskellDepends = [ + ansi-terminal base binary bytestring containers data-accessor + deepseq distributed-process distributed-process-async + distributed-process-client-server distributed-process-extras + distributed-process-tests distributed-static fingertree ghc-prim + hashable HUnit mtl network network-transport network-transport-tcp + QuickCheck rematch stm test-framework test-framework-hunit + test-framework-quickcheck2 time transformers unordered-containers + ]; + homepage = "http://github.com/haskell-distributed/distributed-process-task"; + description = "Task Framework for The Cloud Haskell Application Platform"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "distributed-process-tests" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , distributed-process, distributed-static, HUnit, network - , network-transport, network-transport-tcp, random, rematch + , network-transport, network-transport-tcp, random, rematch, stm , test-framework, test-framework-hunit }: mkDerivation { pname = "distributed-process-tests"; - version = "0.4.1"; - sha256 = "6bcda812a7f39964cbf154fc304363561c942f6b3018898a5b6ba5c1ef3952ca"; + version = "0.4.3.1"; + sha256 = "df2b69250b339baa5180cd46d1d045f33665474f13c1903bb2ff3f2f39e105b6"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static HUnit network network-transport random rematch - test-framework test-framework-hunit + stm test-framework test-framework-hunit ]; testHaskellDepends = [ base network network-transport network-transport-tcp test-framework ]; - jailbreak = true; homepage = "http://github.com/haskell-distributed/distributed-process-tests"; - description = "Tests for distributed-process"; + description = "Tests and test support tools for distributed-process"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -60290,6 +60634,7 @@ self: { homepage = "https://bitbucket.org/davecturner/ekg-rrd"; description = "Passes ekg statistics to rrdtool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ekg-statsd" = callPackage @@ -60318,6 +60663,7 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "elerea" = callPackage @@ -68538,6 +68884,7 @@ self: { homepage = "https://gitlab.com/cpp.cabrera/freer"; description = "Implementation of the Freer Monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "freesect" = callPackage @@ -70629,6 +70976,7 @@ self: { ]; description = "Pure haskell interface to MaxMind GeoIP database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "geojson" = callPackage @@ -70663,6 +71011,7 @@ self: { testHaskellDepends = [ base ieee754 linear QuickCheck ]; description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "getemx" = callPackage @@ -70933,27 +71282,6 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , free, ghc, ghc-paths, HUnit, mtl, silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.3.1.1"; - sha256 = "26d96b92d93d7455f400133a20c0fc1a2ddc62a1be724ebd8ba637c3346ab822"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath free ghc ghc-paths mtl syb - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-paths HUnit - mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-exactprint_0_4_1_0" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , free, ghc, ghc-paths, HUnit, mtl, silently, syb }: @@ -70972,7 +71300,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -78684,7 +79011,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hakyll" = callPackage + "hakyll_4_7_2_3" = callPackage ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring , cmdargs, containers, cryptohash, data-default, deepseq, directory , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache @@ -78722,9 +79049,10 @@ self: { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hakyll_4_7_3_0" = callPackage + "hakyll" = callPackage ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring , cmdargs, containers, cryptohash, data-default, deepseq, directory , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache @@ -78761,7 +79089,6 @@ self: { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-R" = callPackage @@ -81868,6 +82195,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_6_0_11" = callPackage + ({ mkDerivation, base, haskell-src-exts, pretty, syb + , template-haskell, th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.6.0.11"; + sha256 = "1752bf1a27681c71537baa412fc701fb6a49f489c7ef5e05d8c9cca47827c185"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -86671,8 +87014,8 @@ self: { }: mkDerivation { pname = "hgrev"; - version = "0.1.3"; - sha256 = "fa52ca51d6c5bde8cacee51232ddc4452294434d94125eb1cf991e0caee2b52e"; + version = "0.1.4"; + sha256 = "27b11ffd928e4b6bbb7436e15a15ef7632170d90111e3309c37241493795bf9c"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; @@ -86989,6 +87332,7 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Very fast JSON serialisation and parsing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "highlight-versions" = callPackage @@ -92118,6 +92462,7 @@ self: { ]; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -101612,6 +101957,7 @@ self: { testPkgconfigDepends = [ imagemagick ]; description = "bindings to imagemagick library"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) imagemagick;}; "imagepaste" = callPackage @@ -102539,6 +102885,7 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) R;}; "inquire" = callPackage @@ -104625,6 +104972,7 @@ self: { homepage = "http://github.com/ghorn/jacobi-roots"; description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "jail" = callPackage @@ -105246,6 +105594,7 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "jpeg" = callPackage @@ -106143,6 +106492,7 @@ self: { homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "json-togo" = callPackage @@ -109213,6 +109563,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c-quote_0_11_2" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.11.2"; + sha256 = "3776dea34b86cc6032e9883f50a1f801c93b9add4c167d051db4a438a5d1803f"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + homepage = "http://www.cs.drexel.edu/~mainland/"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-cil" = callPackage ({ mkDerivation, base, bool-extras }: mkDerivation { @@ -109824,6 +110200,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -111158,8 +111535,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "0.1.4.1"; - sha256 = "b192640f9f02da76f36b03efa7e19fe6ed025b0b987e9ede0b1c3b44f9140bbd"; + version = "0.1.5.0"; + sha256 = "53696cfa436faf5189031ca979f41bbbdd54c2cf9ead432510f6d532d44c8d8f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112627,7 +113004,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "linear_1_20_1" = callPackage + "linear_1_20_2" = callPackage ({ mkDerivation, adjunctions, base, binary, bytes, bytestring , cereal, containers, deepseq, directory, distributive, doctest , filepath, ghc-prim, hashable, HUnit, lens, reflection @@ -112638,8 +113015,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.20.1"; - sha256 = "80663d724df87959dcae6867dcb3c8e033e3ef62f6cde92723acee9a01c6a9ed"; + version = "1.20.2"; + sha256 = "c9ce0cba74beb9ab59cf9790772e5b01d2786b452099e5831d218371565ec4fe"; libraryHaskellDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -112650,7 +113027,6 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -115562,6 +115938,7 @@ self: { homepage = "https://github.com/hvr/lzma"; description = "LZMA/XZ compression and decompression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) lzma;}; "lzma-clib" = callPackage @@ -115712,6 +116089,7 @@ self: { homepage = "https://github.com/hvr/lzma-streams"; description = "IO-Streams interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "maam" = callPackage @@ -116238,6 +116616,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mainland-pretty_0_4_1_2" = callPackage + ({ mkDerivation, base, containers, srcloc, text }: + mkDerivation { + pname = "mainland-pretty"; + version = "0.4.1.2"; + sha256 = "8ca9e1df8cd6f5c8dc72d799971a7f9c363a36f5cc266a72b3443db653340941"; + libraryHaskellDepends = [ base containers srcloc text ]; + homepage = "http://www.cs.drexel.edu/~mainland/"; + description = "Pretty printing designed for printing source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "majordomo" = callPackage ({ mkDerivation, base, bytestring, cmdargs, monad-loops, old-locale , threads, time, unix, zeromq-haskell @@ -120670,6 +121061,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_14" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.14"; + sha256 = "dc748f55363f0af6e52a4711c73fb54b5579845eb091395a23377afd28c70052"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -122149,29 +122563,6 @@ self: { }) {morfeusz = null;}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, containers, deepseq - , happy, http-client, http-client-tls, managed, microlens - , microlens-mtl, optparse-applicative, pipes, system-fileio - , system-filepath, text, text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.3.0"; - sha256 = "bcaf4af883e8441dff551d05efcb82985051635fe1f38dc80be2fd5bf6471240"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary containers deepseq http-client http-client-tls - managed microlens microlens-mtl pipes system-fileio system-filepath - text text-format transformers - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base optparse-applicative text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_3_1" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq , happy, http-client, http-client-tls, managed, microlens , microlens-mtl, optparse-applicative, pipes, system-fileio @@ -122192,7 +122583,6 @@ self: { executableHaskellDepends = [ base optparse-applicative text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -125927,6 +126317,7 @@ self: { homepage = "http://github.com/taruti/network-fancy"; description = "Networking support with a cleaner API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "network-house" = callPackage @@ -126935,6 +127326,7 @@ self: { homepage = "http://andersk.mit.edu/haskell/nimber/"; description = "Finite nimber arithmetic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "nitro" = callPackage @@ -127674,7 +128066,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numeric-extras" = callPackage + "numeric-extras_0_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "numeric-extras"; @@ -127684,9 +128076,10 @@ self: { homepage = "http://github.com/ekmett/numeric-extras"; description = "Useful tools from the C standard library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numeric-extras_0_1" = callPackage + "numeric-extras" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "numeric-extras"; @@ -127696,7 +128089,6 @@ self: { homepage = "http://github.com/ekmett/numeric-extras"; description = "Useful tools from the C standard library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numeric-limits" = callPackage @@ -128740,6 +129132,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye-trans" = callPackage + ({ mkDerivation, base, monad-control, mtl, opaleye + , postgresql-simple, product-profunctors, transformers-base + }: + mkDerivation { + pname = "opaleye-trans"; + version = "0.1.1"; + sha256 = "c7ec052bff70dd16e0ecbcc4956f1d529a6379a37ff7bf10d248a7c6229d8acf"; + libraryHaskellDepends = [ + base monad-control mtl opaleye postgresql-simple + product-profunctors transformers-base + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "A monad transformer for Opaleye"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "open-browser" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -128799,6 +129208,7 @@ self: { homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "open-union" = callPackage @@ -130800,7 +131210,7 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; - doHaddock = false; + doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -132153,6 +132563,7 @@ self: { homepage = "https://github.com/fanjam/paypal-adaptive-hoops"; description = "Client for a limited part of PayPal's Adaptive Payments API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "paypal-api" = callPackage @@ -133316,7 +133727,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent" = callPackage + "persistent_2_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, hspec, lifted-base, monad-control @@ -133346,10 +133757,11 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_2_1" = callPackage + "persistent" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, hspec, lifted-base, monad-control @@ -133379,7 +133791,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -135659,6 +136070,7 @@ self: { homepage = "https://github.com/jwiegley/pipes-files"; description = "Fast traversal of directory trees using pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "pipes-group_1_0_2" = callPackage @@ -136979,11 +137391,13 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "polynomials-bernstein"; - version = "1.1.1"; - sha256 = "e63d5fab25e57722b7699eb83a9595df2929a9b7095522630eb2fc4750e44d5e"; + version = "1.1.2"; + sha256 = "6950f2e791533a40e7e41ff98679f680f27c7b66258b57871027bf0e5adc7062"; libraryHaskellDepends = [ base vector ]; + jailbreak = true; description = "A solver for systems of polynomial equations in bernstein form"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polyparse_1_9" = callPackage @@ -145137,6 +145551,7 @@ self: { homepage = "https://github.com/nh2/reinterpret-cast"; description = "Memory reinterpretation casts for Float/Double and Word32/Word64"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "relacion" = callPackage @@ -150550,6 +150965,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scientific_0_3_4_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty + , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , text, vector + }: + mkDerivation { + pname = "scientific"; + version = "0.3.4.0"; + sha256 = "fd681501f742f55fb092c967a42f537c8059db40f8b4a8870b07fe499944e97d"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq ghc-prim hashable + integer-gmp text vector + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scion" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset @@ -151190,11 +151629,13 @@ self: { ({ mkDerivation, base, SDL2, sdl2, SDL2_ttf }: mkDerivation { pname = "sdl2-ttf"; - version = "0.2.1"; - sha256 = "a6d05155c07be31b179679328a9c7c5af10a02622fc6b31791c00ab07407e670"; + version = "0.2.2"; + sha256 = "cfe52e240f00e86edf723f08a6b6de1dd5e0ab390ed030458111e45ee9db1266"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base sdl2 ]; librarySystemDepends = [ SDL2 SDL2_ttf ]; - testHaskellDepends = [ base sdl2 ]; + executableHaskellDepends = [ base sdl2 ]; description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -152103,6 +152544,7 @@ self: { libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "seqid_0_1_0" = callPackage @@ -160173,6 +160615,7 @@ self: { homepage = "http://michael.orlitzky.com/code/spline3.php"; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "splines" = callPackage @@ -160410,6 +160853,7 @@ self: { homepage = "https://github.com/yanatan16/haskell-spsa"; description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "spy" = callPackage @@ -164396,7 +164840,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stylish-haskell" = callPackage + "stylish-haskell_0_5_14_2" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb , test-framework, test-framework-hunit, yaml @@ -164423,9 +164867,10 @@ self: { homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stylish-haskell_0_5_14_3" = callPackage + "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb , test-framework, test-framework-hunit, yaml @@ -164452,7 +164897,6 @@ self: { homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stylized" = callPackage @@ -164510,6 +164954,7 @@ self: { homepage = "http://github.com/mikeizbicki/subhask"; description = "Type safe interface for programming in subcategories of Hask"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "subnet" = callPackage @@ -165492,6 +165937,7 @@ self: { homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "syntactical" = callPackage @@ -170908,6 +171354,7 @@ self: { homepage = "https://github.com/nicta/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "tictactoe3d" = callPackage @@ -171163,6 +171610,7 @@ self: { homepage = "https://github.com/enzoh/time-exts"; description = "Efficient Timestamps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "time-http" = callPackage @@ -171281,6 +171729,7 @@ self: { homepage = "https://github.com/christian-marie/time-qq"; description = "Quasi-quoter for UTCTime times"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "time-recurrence" = callPackage @@ -173784,6 +174233,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turing" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "turing"; + version = "0.1.0"; + sha256 = "21a55a9a0e98004702874237b85eb9a603cce0cc8c96d2271d7256baa0f15896"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/sebastianpoeplau/turing#readme"; + description = "A simple simulator for Turing machines"; + license = "GPL"; + }) {}; + "turing-music" = callPackage ({ mkDerivation, ALUT, base }: mkDerivation { @@ -175893,12 +176355,12 @@ self: { }) {inherit (pkgs) openssl;}; "uniform-pair" = callPackage - ({ mkDerivation, base, ShowF }: + ({ mkDerivation, base, deepseq, ShowF }: mkDerivation { pname = "uniform-pair"; - version = "0.1.8"; - sha256 = "1668512c64d71f299a4b3f477dbf1b027cf38e65e4892c68cda3ca7f3d98e316"; - libraryHaskellDepends = [ base ShowF ]; + version = "0.1.9"; + sha256 = "10670c5aa26cf1c1555aa0c8f21e3edf1eca7577c9bc205c159dbf7edd6063fa"; + libraryHaskellDepends = [ base deepseq ShowF ]; homepage = "https://github.com/conal/uniform-pair/"; description = "Uniform pairs with class instances"; license = stdenv.lib.licenses.bsd3; @@ -177938,8 +178400,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uulib"; - version = "0.9.20"; - sha256 = "e2bb4d7b2aa0d3e987748185589d7d25b453d3ee448a468aab8971df651ee7e3"; + version = "0.9.21"; + sha256 = "d0bc9e607a5c9b0144994a70d0f95b93c5a3adfa832fcdea66b7b7d121fbf829"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/UU-ComputerScience/uulib"; description = "Haskell Utrecht Tools Library"; @@ -179924,6 +180386,8 @@ self: { pname = "wai"; version = "3.0.4.0"; sha256 = "0e5399a5a4e50715c2c34def47553ad278265f2f5f823d06ad5b080b1eb0a194"; + revision = "1"; + editedCabalFile = "76e40af52032161c0dd6bf878779889ff2b097eda11303f963e5ba40fef9615b"; libraryHaskellDepends = [ base blaze-builder bytestring bytestring-builder http-types network text transformers unix-compat vault @@ -181178,6 +181642,7 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "wai-middleware-etag" = callPackage @@ -182635,6 +183100,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_1_4" = callPackage + ({ mkDerivation, array, async, auto-update, base, blaze-builder + , bytestring, bytestring-builder, case-insensitive, containers + , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date + , http-types, http2, HUnit, iproute, lifted-base, network + , old-locale, process, QuickCheck, simple-sendfile, stm + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.1.4"; + sha256 = "6e7e96dd49f0d0635e3453dbe3a074db3ab8ce69ce48b9da7701f211198029b9"; + libraryHaskellDepends = [ + array auto-update base blaze-builder bytestring bytestring-builder + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base blaze-builder bytestring + bytestring-builder case-insensitive containers directory doctest + ghc-prim hashable hspec HTTP http-date http-types http2 HUnit + iproute lifted-base network old-locale process QuickCheck + simple-sendfile stm streaming-commons text time transformers unix + unix-compat vault wai word8 + ]; + jailbreak = true; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -183986,7 +184485,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "websockets" = callPackage + "websockets_0_9_5_0" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy , HUnit, mtl, network, QuickCheck, random, SHA, test-framework @@ -184009,9 +184508,10 @@ self: { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "websockets_0_9_6_0" = callPackage + "websockets" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy , HUnit, network, QuickCheck, random, SHA, test-framework @@ -184040,7 +184540,6 @@ self: { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-snap" = callPackage @@ -193735,6 +194234,7 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "z3" = callPackage From 741437dffc371c55d9b95fbf67a37517195effb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Sep 2015 11:35:36 +0200 Subject: [PATCH 16/44] configuration-hackage2nix.yaml: update list of broken packages --- .../configuration-hackage2nix.yaml | 59 ++++++++++++++++++- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b37b420c8de5..5ef99e049a6e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -216,6 +216,11 @@ dont-distribute-packages: ALUT: [ x86_64-darwin ] al: [ x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ec2: [ i686-linux ] + amazonka-rds: [ i686-linux ] + amazonka-s3: [ i686-linux ] + amazonka-sqs: [ i686-linux ] + amazonka-swf: [ i686-linux ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -252,6 +257,8 @@ dont-distribute-packages: ariadne: [ i686-linux, x86_64-linux, x86_64-darwin ] arion: [ i686-linux, x86_64-linux, x86_64-darwin ] arith-encode: [ i686-linux, x86_64-linux, x86_64-darwin ] + arithmetic: [ i686-linux ] + arithmoi: [ i686-linux ] armada: [ i686-linux, x86_64-linux, x86_64-darwin ] array-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] ArrayRef: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -405,6 +412,7 @@ dont-distribute-packages: bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] BitSyntax: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + bit-vector: [ i686-linux ] bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] black-jewel: [ i686-linux, x86_64-linux, x86_64-darwin ] bla: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -440,6 +448,8 @@ dont-distribute-packages: bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + buffer-builder-aeson: [ i686-linux ] + buffer-builder: [ i686-linux ] buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] buildwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -460,6 +470,7 @@ dont-distribute-packages: cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -481,6 +492,7 @@ dont-distribute-packages: cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] calc: [ i686-linux, x86_64-linux, x86_64-darwin ] + calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] caldims: [ i686-linux, x86_64-linux, x86_64-darwin ] caledon: [ i686-linux, x86_64-linux, x86_64-darwin ] call-haskell-from-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -531,6 +543,7 @@ dont-distribute-packages: cflp: [ i686-linux, x86_64-linux, x86_64-darwin ] cfopu: [ i686-linux, x86_64-linux, x86_64-darwin ] cgen: [ i686-linux, x86_64-linux, x86_64-darwin ] + cg: [ i686-linux ] cgi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -625,6 +638,7 @@ dont-distribute-packages: compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] compression: [ i686-linux, x86_64-linux, x86_64-darwin ] compstrat: [ i686-linux, x86_64-linux, x86_64-darwin ] comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -650,6 +664,7 @@ dont-distribute-packages: consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] + constructible: [ i686-linux ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -739,6 +754,7 @@ dont-distribute-packages: curves: [ i686-linux, x86_64-linux, x86_64-darwin ] cv-combinators: [ x86_64-darwin ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] + cyclotomic: [ i686-linux ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -759,6 +775,7 @@ dont-distribute-packages: darkplaces-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] + datadog: [ i686-linux ] data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -951,6 +968,8 @@ dont-distribute-packages: ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-rrd: [ i686-linux ] + electrum-mnemonic: [ i686-linux ] email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1102,6 +1121,7 @@ dont-distribute-packages: freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] freenect: [ x86_64-darwin ] free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] + freer: [ i686-linux ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1159,8 +1179,11 @@ dont-distribute-packages: geniserver: [ i686-linux, x86_64-linux, x86_64-darwin ] geni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] GenSmsPdu: [ i686-linux, x86_64-linux, x86_64-darwin ] + GenussFold: [ i686-linux ] geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] + geoip2: [ i686-linux ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] + geom2d: [ i686-linux ] GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] getemx: [ i686-linux, x86_64-linux, x86_64-darwin ] getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1197,6 +1220,7 @@ dont-distribute-packages: gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] + GLM: [ i686-linux, x86_64-linux, x86_64-darwin ] global: [ i686-linux, x86_64-linux, x86_64-darwin ] glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1600,6 +1624,7 @@ dont-distribute-packages: Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] + highjson: [ i686-linux ] highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] himg: [ i686-linux, x86_64-linux, x86_64-darwin ] himpy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1709,6 +1734,7 @@ dont-distribute-packages: HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] hplayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hplaylist: [ i686-linux, x86_64-linux, x86_64-darwin ] HPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1729,6 +1755,7 @@ dont-distribute-packages: HROOT: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-io: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + hruby: [ i686-linux ] hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1912,6 +1939,7 @@ dont-distribute-packages: ihaskell-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] ihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] illuminate: [ i686-linux, x86_64-linux, x86_64-darwin ] + imagemagick: [ i686-linux ] imagepaste: [ i686-linux, x86_64-linux, x86_64-darwin ] imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1935,6 +1963,7 @@ dont-distribute-packages: inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inilist: [ i686-linux, x86_64-linux, x86_64-darwin ] + inline-r: [ i686-linux ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1983,6 +2012,7 @@ dont-distribute-packages: jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] + jacobi-roots: [ i686-linux ] jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1997,6 +2027,7 @@ dont-distribute-packages: joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] jort: [ i686-linux, x86_64-linux, x86_64-darwin ] + jose-jwt: [ i686-linux ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2014,6 +2045,7 @@ dont-distribute-packages: json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonresume: [ i686-linux, x86_64-linux, x86_64-darwin ] json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-stream: [ i686-linux ] json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2089,6 +2121,7 @@ dont-distribute-packages: language-java-classfile: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-puppet: [ i686-linux ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2214,6 +2247,8 @@ dont-distribute-packages: lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] lxc: [ x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] + lzma: [ i686-linux ] + lzma-streams: [ i686-linux ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2428,6 +2463,7 @@ dont-distribute-packages: network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-fancy: [ i686-linux ] network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] network-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2442,6 +2478,7 @@ dont-distribute-packages: NGrams: [ i686-linux, x86_64-linux, x86_64-darwin ] nibblestring: [ i686-linux, x86_64-linux, x86_64-darwin ] nikepub: [ i686-linux, x86_64-linux, x86_64-darwin ] + nimber: [ i686-linux ] Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2464,6 +2501,7 @@ dont-distribute-packages: np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] nthable: [ i686-linux, x86_64-linux, x86_64-darwin ] + NTRU: [ i686-linux ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2512,6 +2550,7 @@ dont-distribute-packages: OpenSCAD: [ i686-linux, x86_64-linux, x86_64-darwin ] openssh-github-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-typerep: [ i686-linux ] open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2561,6 +2600,7 @@ dont-distribute-packages: Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] + paypal-adaptive-hoops: [ i686-linux ] paypal-api: [ i686-linux, x86_64-linux, x86_64-darwin ] pb: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2607,6 +2647,7 @@ dont-distribute-packages: pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-files: [ i686-linux ] pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2632,6 +2673,7 @@ dont-distribute-packages: pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] + polynomials-bernstein: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2816,6 +2858,7 @@ dont-distribute-packages: reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] rei: [ i686-linux, x86_64-linux, x86_64-darwin ] + reinterpret-cast: [ i686-linux ] relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] remote: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2943,6 +2986,7 @@ dont-distribute-packages: sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-ttf: [ i686-linux, x86_64-linux, x86_64-darwin ] SDL-mixer: [ x86_64-darwin ] + sdr: [ i686-linux ] sdr: [ x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2962,10 +3006,12 @@ dont-distribute-packages: sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] + seqalign: [ i686-linux ] SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3107,6 +3153,7 @@ dont-distribute-packages: sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] spike: [ i686-linux, x86_64-linux, x86_64-darwin ] splaytree: [ i686-linux, x86_64-linux, x86_64-darwin ] + spline3: [ i686-linux ] splines: [ i686-linux, x86_64-linux, x86_64-darwin ] split-record: [ i686-linux, x86_64-linux, x86_64-darwin ] splot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3114,6 +3161,7 @@ dont-distribute-packages: spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] + spsa: [ i686-linux ] spy: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3155,6 +3203,7 @@ dont-distribute-packages: structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] + subhask: [ i686-linux ] sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3179,6 +3228,7 @@ dont-distribute-packages: sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sync: [ i686-linux, x86_64-linux, x86_64-darwin ] sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntactic: [ i686-linux ] syntax-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3265,6 +3315,7 @@ dont-distribute-packages: thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + tickle: [ i686-linux ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-midi: [ x86_64-darwin ] @@ -3273,11 +3324,13 @@ dont-distribute-packages: timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] time-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-exts: [ i686-linux ] time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-qq: [ i686-linux ] time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] timestamp-subprocess-lines: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3472,6 +3525,7 @@ dont-distribute-packages: wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-crowd: [ i686-linux ] wai-middleware-etag: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3526,6 +3580,7 @@ dont-distribute-packages: winio: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] wlc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + WMSigner: [ i686-linux ] wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3662,6 +3717,7 @@ dont-distribute-packages: yql: [ i686-linux, x86_64-linux, x86_64-darwin ] yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] + yxdb-utils: [ i686-linux ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3685,6 +3741,3 @@ dont-distribute-packages: zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] ztail: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] - HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] From 6b934c30d3eb8ff55b78f14214f15befa09859d8 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 30 Sep 2015 11:35:49 +0200 Subject: [PATCH 17/44] neardal: init at 0.7-post-git-20150930 --- .../development/libraries/neardal/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/neardal/default.nix diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix new file mode 100644 index 000000000000..8ef5d83c211f --- /dev/null +++ b/pkgs/development/libraries/neardal/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline }: + +stdenv.mkDerivation rec { + name = "neardal-0.7-post-git-20150930"; + + src = fetchFromGitHub { + owner = "connectivity"; + repo = "neardal"; + rev = "5b1c8b5c2c45c10f11cee12fbcb397f8953850d7"; + sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig glib readline ]; + + preConfigure = '' + sh autogen.sh + ''; + + configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ]; + + meta = with stdenv.lib; { + description = "C APIs to exchange datas with the NFC daemon 'Neard'"; + license = licenses.lgpl2; + homepage = https://01.org/linux-nfc; + maintainers = with maintainers; [ tstrobel ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ccf4b109a60..9d75eae8cacc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7658,6 +7658,8 @@ let ncurses = callPackage ../development/libraries/ncurses { }; + neardal = callPackage ../development/libraries/neardal { }; + neon = callPackage ../development/libraries/neon { compressionSupport = true; sslSupport = true; From c346eeae516d7de5de236e6e3dfdf404c97f3f92 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Wed, 30 Sep 2015 12:05:35 +0200 Subject: [PATCH 18/44] python-packages: pygit2 0.21.2 -> 0.23.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5983ff67a3e5..9d28c13e322d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10940,11 +10940,11 @@ let }; pygit2 = buildPythonPackage rec { - name = "pygit2-0.21.2"; + name = "pygit2-0.23.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz"; - sha256 = "0lya4v91d4y5fwrb55n8m8avgmz0l81jml2spvx6r7j1czcx3zic"; + sha256 = "04201vcal7jq8lbpk9ylscrhjxdcf2aihiw25k4imjjqgfmvldf7"; }; preConfigure = ( if stdenv.isDarwin then '' From 246e306d2a5271341508883946d863482d17c706 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 30 Sep 2015 06:22:56 -0500 Subject: [PATCH 19/44] kde-workspace: fix build with kdelibs-4.14.12 kdelibs-4.14.12 enables stricter CMake policies which break the build. Patch to disable the offending test. --- pkgs/applications/kde-apps-15.04/default.nix | 1 + ...guard-0001-disable-signalplottertest.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 6f05e8557591..4bae82976af2 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -289,6 +289,7 @@ let kde-wallpapers = kde4Package super.kde-wallpapers; kde-workspace = extendDerivation (kde4Package super.kde-workspace) { + patches = [ ./kde-workspace/ksysguard-0001-disable-signalplottertest.patch ]; buildInputs = with scope.xorg; [ libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil ]; diff --git a/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch b/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch new file mode 100644 index 000000000000..cd19b7e2d72a --- /dev/null +++ b/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch @@ -0,0 +1,36 @@ +From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 7 Sep 2015 18:55:44 -0500 +Subject: [PATCH] ksysguard disable signalplottertest + +--- + libs/ksysguard/tests/CMakeLists.txt | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt +index d472fd7..f178b71 100644 +--- a/libs/ksysguard/tests/CMakeLists.txt ++++ b/libs/ksysguard/tests/CMakeLists.txt +@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB + set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) + kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} ) + target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) +- +- +-# KGraphicsSignalPlotter benchmark +-set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp) +-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} ) +-target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) +- +- +-# KSignalPlotter unit test +-set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp) +-kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} ) +-target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ) +- +- +- +- +-- +2.5.0 + From a6c81b2b29e27db7d26139a9aa2d7e7a1c5461fe Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 30 Sep 2015 06:25:23 -0500 Subject: [PATCH 20/44] phonon_qt5_backend_gstreamer: un-rename Accidentally renamed to phonon_backend_gstreamer_qt5 in Qt 5.5 upgrade. --- 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 9d75eae8cacc..8f22047db65e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7819,7 +7819,7 @@ let phonon_qt5 = callPackage ../development/libraries/phonon/qt5/old.nix {}; - phonon_backend_gstreamer_qt5 = callPackage ../development/libraries/phonon-backend-gstreamer/qt5/old.nix {}; + phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5/old.nix {}; physfs = callPackage ../development/libraries/physfs { }; From 7696ac23b9738057ce268735585e9ee0ceaa0ad4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 30 Sep 2015 07:24:01 -0500 Subject: [PATCH 21/44] quassel: add compatibility aliases --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f22047db65e..8745e2f1f59e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6687,6 +6687,7 @@ let }; kf513Packages = lib.makeScope kf513.newScope kf5PackagesFun; + kf5Packages = kf513Packages; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; @@ -15126,6 +15127,11 @@ aliases = with self; rec { lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 nfsUtils = nfs-utils; # added 2014-12-06 + quassel_qt5 = kf5Packages.quassel_qt5; # added 2015-09-30 + quasselClient_qt5 = kf5Packages.quasselClient_qt5; # added 2015-09-30 + quasselDaemon_qt5 = kf5Packages.quasselDaemon_qt5; # added 2015-09-30 + quassel_kf5 = kf5Packages.quassel; # added 2015-09-30 + quasselClient_kf5 = kf5Packages.quasselClient; # added 2015-09-30 rdiff_backup = rdiff-backup; # added 2014-11-23 rssglx = rss-glx; #added 2015-03-25 rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 From d323fa9f8be3c057426effa69b98d1eaed2f5f95 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 30 Sep 2015 07:40:44 -0500 Subject: [PATCH 22/44] quasselDaemon: fix typo --- 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 8745e2f1f59e..654b02c4f493 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15129,7 +15129,7 @@ aliases = with self; rec { nfsUtils = nfs-utils; # added 2014-12-06 quassel_qt5 = kf5Packages.quassel_qt5; # added 2015-09-30 quasselClient_qt5 = kf5Packages.quasselClient_qt5; # added 2015-09-30 - quasselDaemon_qt5 = kf5Packages.quasselDaemon_qt5; # added 2015-09-30 + quasselDaemon_qt5 = kf5Packages.quasselDaemon; # added 2015-09-30 quassel_kf5 = kf5Packages.quassel; # added 2015-09-30 quasselClient_kf5 = kf5Packages.quasselClient; # added 2015-09-30 rdiff_backup = rdiff-backup; # added 2014-11-23 From df9fc0f8e024d755843d4055c5f702a317b468bd Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 30 Sep 2015 12:48:27 +0000 Subject: [PATCH 23/44] Remove nixops unstable expression, until we reintroduce it again. Currently it is not referenced, as nixopsUnstable = nixops. --- .../package-management/nixops/unstable.nix | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 pkgs/tools/package-management/nixops/unstable.nix diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix deleted file mode 100644 index 011ebf7198e6..000000000000 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, pythonPackages, fetchgit, libxslt, docbook5_xsl, openssh }: - -pythonPackages.buildPythonPackage rec { - name = "nixops-1.3pre-cefcd9ba"; - namePrefix = ""; - - src = fetchgit { - url = https://github.com/NixOS/nixops; - rev = "9a05ebc332701247fa99fbf6d1215d48e08f3edd"; - sha256 = "17vxr51wpdd5dnasiaafga3a6ddhxyrwgr0yllczxj6bq0n5skp2"; - }; - - buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ]; - - propagatedBuildInputs = - [ pythonPackages.prettytable - pythonPackages.boto - pythonPackages.hetzner - pythonPackages.libcloud - pythonPackages.sqlite3 - ]; - - doCheck = true; - - postInstall = - '' - # Backward compatibility symlink. - ln -s nixops $out/bin/charon - - # Documentation build is currently broken. Re-try with newer version. - : make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ - docdir=$out/share/doc/nixops mandir=$out/share/man - - mkdir -p $out/share/nix/nixops - cp -av "nix/"* $out/share/nix/nixops - - # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL - # the version of openssh is causing errors when have big networks (40+) - wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" - ''; - - meta = { - homepage = https://github.com/NixOS/nixops; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = [ lib.maintainers.tv ]; - platforms = lib.platforms.unix; - }; -} From ca4a4714efd1015e61a33f16b8bc1371fe8c08e1 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 30 Sep 2015 16:05:54 +0200 Subject: [PATCH 24/44] neardal: add 'ncl' and 'demo' application --- pkgs/development/libraries/neardal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 8ef5d83c211f..23098a463370 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline, makeWrapper }: stdenv.mkDerivation rec { name = "neardal-0.7-post-git-20150930"; @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - buildInputs = [ autoconf automake libtool pkgconfig glib readline ]; + buildInputs = [ autoconf automake libtool pkgconfig glib readline makeWrapper ]; preConfigure = '' + substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" + substituteInPlace "demo/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" sh autogen.sh ''; From cc29a6e788f9753e565dfd2ee5ef330a057ac3fb Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 30 Sep 2015 16:08:32 +0200 Subject: [PATCH 25/44] neard: add sample applications --- pkgs/servers/neard/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 948da3b02251..a76f10a262db 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }: stdenv.mkDerivation rec { name = "neard-0.15-post-git-20510929"; @@ -8,13 +8,20 @@ stdenv.mkDerivation rec { sha256 = "08327b536ad8460a08bdceeec48c561e75ca56e5e0ee034c40d02cd1545906c0"; }; - buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl ]; + buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; + pythonPath = [ pythonPackages.pygobject pythonPackages.dbus pythonPackages.pygtk ]; configureFlags = [ "--disable-debug" "--enable-tools" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; postInstall = '' + install -m 0755 tools/snep-send $out/bin/ + install -D -m644 src/neard.service $out/lib/systemd/system/neard.service install -D -m644 src/main.conf $out/etc/neard/main.conf + + install -d $out/lib/neard + install -m 0755 test/* $out/lib/neard/ + wrapPythonProgramsIn $out/lib/neard "$out $pythonPath" ''; meta = with stdenv.lib; { From ece50d57cede41efcc30f92ede95f7fc19ab7f88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Sep 2015 16:15:36 +0200 Subject: [PATCH 26/44] rl-1509.xml: update Haskell-related release notes - Update the link to the manual to refer to the proper place. - Mention LTS Haskell and Stackage Nightly. - Minor cosmetic to improve readability. --- nixos/doc/manual/release-notes/rl-1509.xml | 73 +++++++++++++--------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index a2f38d99b25f..5bed5c20c177 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -12,16 +12,25 @@ has the following highlights: - The Haskell packages infrastructure has been re-designed - from the ground up. NixOS now distributes the latest version of - every single package registered on Hackage, i.e. well - over 8000 Haskell packages. Further information and usage - instructions for the improved infrastructure are available at - https://nixos.org/wiki/Haskell. - Users migrating from an earlier release will also find helpful - information below, in the list of backwards-incompatible changes. + The Haskell + packages infrastructure has been re-designed from the ground up + ("Haskell NG"). NixOS now distributes the latest version + of every single package registered on Hackage -- well in + excess of 8,000 Haskell packages. Detailed instructions on how to + use that infrastructure can be found in the User's + Guide to the Haskell Infrastructure. Users migrating from an + earlier release may find helpful information below, in the list of + backwards-incompatible changes. Furthermore, we distribute 51(!) + additional Haskell package sets that provide every single LTS Haskell release + since version 0.0 as well as the most recent Stackage Nightly + snapshot. The announcement "Full + Stackage Support in Nixpkgs" gives additional + details. @@ -135,38 +144,44 @@ fileSystems."/shiny" = { - Haskell packages can no longer be found by name, except for - ghc, cabal-install, and - stack, even though we do package the whole Hackage. - The reason for this inconvenience is the sheer size of the Haskell - package set: name-based lookups such as these would become much - slower than they are today if we'd add the entire Hackage database - into the top level attribute set. Instead, the list of Haskell - packages can be displayed by + "nix-env -qa" no longer discovers + Haskell packages by name. The only packages visible in the global + scope are ghc, cabal-install, + and stack, but all other packages are hidden. The + reason for this inconvenience is the sheer size of the Haskell + package set. Name-based lookups are expensive, and most + nix-env -qa operations would become much slower + if we'd add the entire Hackage database into the top level attribute + set. Instead, the list of Haskell packages can be displayed by + running: nix-env -f "<nixpkgs>" -qaP -A haskellPackages - and packages can be installed with: + Executable programs written in Haskell can be installed with: -nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install +nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc + + Installing Haskell libraries this way, however, is no + longer supported. See the next item for more details. + Previous versions of NixOS came with a feature called - ghc-wrapper, a small wrapper script that allows - GHC to transparently pick up on libraries installed in the user's - profile. This feature has been deprecated; - ghc-wrapper was removed from the distribution. - The proper way to register Haskell libraries with the compiler now - is the haskellPackages.ghcWithPackages - function. - https://nixos.org/wiki/Haskell - provides much information about this subject. + ghc-wrapper, a small script that allowed GHC to + transparently pick up on libraries installed in the user's profile. This + feature has been deprecated; ghc-wrapper was removed + from the distribution. The proper way to register Haskell libraries with + the compiler now is the haskellPackages.ghcWithPackages + function. The User's + Guide to the Haskell Infrastructure provides more information about + this subject. From 750e15fbd70af5a9bf29f6a07ac61ac6da9158c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Sep 2015 16:23:06 +0200 Subject: [PATCH 27/44] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-6-g5d5ccfe-dirty using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/7a2a9bbe1595c73f9aa2bba4c2a600c558ef5822 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/82f4bbff1b525f7cf33c525987268cdc651c3d33 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/831a37566be736e827a8f17d6c006a09ed384cd6 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/e7fd25c827f2a1bfb13ea6e716579b697a566ac3 --- .../haskell-modules/configuration-lts-0.0.nix | 2 + .../haskell-modules/configuration-lts-0.1.nix | 2 + .../haskell-modules/configuration-lts-0.2.nix | 2 + .../haskell-modules/configuration-lts-0.3.nix | 2 + .../haskell-modules/configuration-lts-0.4.nix | 2 + .../haskell-modules/configuration-lts-0.5.nix | 2 + .../haskell-modules/configuration-lts-0.6.nix | 2 + .../haskell-modules/configuration-lts-0.7.nix | 2 + .../haskell-modules/configuration-lts-1.0.nix | 2 + .../haskell-modules/configuration-lts-1.1.nix | 2 + .../configuration-lts-1.10.nix | 2 + .../configuration-lts-1.11.nix | 2 + .../configuration-lts-1.12.nix | 2 + .../configuration-lts-1.13.nix | 2 + .../configuration-lts-1.14.nix | 2 + .../configuration-lts-1.15.nix | 2 + .../haskell-modules/configuration-lts-1.2.nix | 2 + .../haskell-modules/configuration-lts-1.4.nix | 2 + .../haskell-modules/configuration-lts-1.5.nix | 2 + .../haskell-modules/configuration-lts-1.7.nix | 2 + .../haskell-modules/configuration-lts-1.8.nix | 2 + .../haskell-modules/configuration-lts-1.9.nix | 2 + .../haskell-modules/configuration-lts-2.0.nix | 2 + .../haskell-modules/configuration-lts-2.1.nix | 2 + .../configuration-lts-2.10.nix | 2 + .../configuration-lts-2.11.nix | 2 + .../configuration-lts-2.12.nix | 2 + .../configuration-lts-2.13.nix | 2 + .../configuration-lts-2.14.nix | 2 + .../configuration-lts-2.15.nix | 3 + .../configuration-lts-2.16.nix | 3 + .../configuration-lts-2.17.nix | 3 + .../configuration-lts-2.18.nix | 3 + .../configuration-lts-2.19.nix | 3 + .../haskell-modules/configuration-lts-2.2.nix | 2 + .../configuration-lts-2.20.nix | 3 + .../configuration-lts-2.21.nix | 3 + .../configuration-lts-2.22.nix | 3 + .../haskell-modules/configuration-lts-2.3.nix | 2 + .../haskell-modules/configuration-lts-2.4.nix | 2 + .../haskell-modules/configuration-lts-2.5.nix | 2 + .../haskell-modules/configuration-lts-2.6.nix | 2 + .../haskell-modules/configuration-lts-2.7.nix | 2 + .../haskell-modules/configuration-lts-2.8.nix | 2 + .../haskell-modules/configuration-lts-2.9.nix | 2 + .../haskell-modules/configuration-lts-3.0.nix | 2 + .../haskell-modules/configuration-lts-3.1.nix | 2 + .../haskell-modules/configuration-lts-3.2.nix | 2 + .../haskell-modules/configuration-lts-3.3.nix | 2 + .../haskell-modules/configuration-lts-3.4.nix | 2 + .../haskell-modules/configuration-lts-3.5.nix | 2 + .../haskell-modules/configuration-lts-3.6.nix | 2 + .../haskell-modules/configuration-lts-3.7.nix | 2 + .../haskell-modules/hackage-packages.nix | 174 ++++++++++++++++-- 54 files changed, 275 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 281a5156d195..3d9330cd7418 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -5684,6 +5684,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5918,6 +5919,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_4"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index df9302c9e1a3..1f74dadedcb4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -5683,6 +5683,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5917,6 +5918,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_4"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 914535329048..6b003dcc802f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -5683,6 +5683,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5917,6 +5918,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_4"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 4fa36f8b9fd2..f95d820bab81 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -5683,6 +5683,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5917,6 +5918,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_4"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index fae443d7eaf4..92e5596a7057 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -5680,6 +5680,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5914,6 +5915,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index e7f5dab9edf6..eeadf8d700e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -5680,6 +5680,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5914,6 +5915,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index b803122a9698..c149525bfa58 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -5675,6 +5675,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5909,6 +5910,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index cf9b5b0d0f9d..df2eee386b6a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -5675,6 +5675,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5909,6 +5910,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 11adef7fbbd6..7e329288c55a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -5663,6 +5663,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5896,6 +5897,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 40ef48578e66..ade57c125a56 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -5649,6 +5649,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5882,6 +5883,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 3c9145c2aa85..4509bb5f9767 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -5621,6 +5621,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5852,6 +5853,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 4b1be2d3b504..eb96c98c8091 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -5617,6 +5617,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5848,6 +5849,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 5333080d52dc..f459acda4b0c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -5616,6 +5616,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5847,6 +5848,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 7bb9c2b5c1e7..473a411341e8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -5613,6 +5613,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5844,6 +5845,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 58cd8ecf719d..86c4599aa480 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -5606,6 +5606,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5837,6 +5838,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index cebc0e2797f5..bcd56e34e017 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -5597,6 +5597,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5828,6 +5829,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 0e9d8d0cd0c0..29468b882dfb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -5646,6 +5646,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5878,6 +5879,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index daeb11e1c36d..bd4ea0dd052d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -5641,6 +5641,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5873,6 +5874,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 9b5f97c3ad06..973c44f885e3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -5639,6 +5639,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5871,6 +5872,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 98f682abee87..112dc617c663 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -5632,6 +5632,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5864,6 +5865,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 4150c09f48bb..40ee620c36f2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -5627,6 +5627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5859,6 +5860,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 6844afe8d36d..45909e596839 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -5624,6 +5624,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5855,6 +5856,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 48c9f6abc619..b11efbecd5da 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -5534,6 +5534,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5764,6 +5765,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 7f8381f798c4..bdabcf66741f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -5532,6 +5532,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5762,6 +5763,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index e2d0bffa7549..3c1e30aae4dc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -5483,6 +5483,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5711,6 +5712,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index db328b6c7feb..6d93ac1ef890 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -5475,6 +5475,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5702,6 +5703,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 52649aa0049d..7b28cf259437 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -5475,6 +5475,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5702,6 +5703,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 9092f8cb3a34..f1f4aa3acf6f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -5472,6 +5472,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5699,6 +5700,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 9e8e784ba297..5bc3d463b2b8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -5469,6 +5469,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5696,6 +5697,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 738b1b84c432..95d58823ab72 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -2539,6 +2539,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_3_0"; "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; @@ -5463,6 +5464,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5690,6 +5692,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 8eb2bbab2b25..050bd7602d31 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -2534,6 +2534,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_3_0"; "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; @@ -5452,6 +5453,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5678,6 +5680,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 0a74d6dc1b2e..6186cef1f0c3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -2531,6 +2531,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_3_0"; "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; @@ -5443,6 +5444,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5668,6 +5670,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 48cfbb2a5ace..a3f1245e92d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -2526,6 +2526,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_3_0"; "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; @@ -5433,6 +5434,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5658,6 +5660,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 2a769e0ca465..b50dee90ae92 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -2526,6 +2526,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_3_0"; "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; @@ -5430,6 +5431,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5655,6 +5657,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 0092d319cd8d..133014f10371 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -5528,6 +5528,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5757,6 +5758,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 4d419a37c242..38f2428eb8ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -2523,6 +2523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_3_0"; "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; @@ -5425,6 +5426,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5650,6 +5652,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 9fc268d12129..263bf61e6495 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -2523,6 +2523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_3_0"; "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; @@ -5423,6 +5424,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5648,6 +5650,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 5ff66696ad83..ba8752625156 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -2522,6 +2522,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = doDistribute super."distributed-process-simplelocalnet_0_2_3_0"; "distributed-process-supervisor" = doDistribute super."distributed-process-supervisor_0_1_2"; "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; @@ -5419,6 +5420,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5644,6 +5646,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index cea6010f9d58..f5c0bb7f4d30 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -5525,6 +5525,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5754,6 +5755,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index e8a136108158..b74571404f72 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -5522,6 +5522,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5750,6 +5751,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 5486871c5a41..0ffe715f910c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -5519,6 +5519,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5747,6 +5748,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 127d1d9b8ebb..e43a0ede7020 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -5512,6 +5512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5740,6 +5741,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 235c326a920d..3215a2f23f2b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -5510,6 +5510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5738,6 +5739,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index c7a910294272..914923cb6e93 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -5505,6 +5505,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5733,6 +5734,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index ae53152af1f4..03c784ef742d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -5495,6 +5495,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5723,6 +5724,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 1e95a694c7bf..2aaeb734cef9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -5184,6 +5184,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5400,6 +5401,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 6ebfcc67b630..6811352e1108 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -5175,6 +5175,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5391,6 +5392,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index fe08c0a30f01..eb7552d7584e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -5165,6 +5165,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5381,6 +5382,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 2939f338b83a..9003a7bca23f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -5153,6 +5153,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5369,6 +5370,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 6bf6d6ef81fd..d4cbf00504c4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -5152,6 +5152,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5367,6 +5368,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 83ceef218fd9..4a95dce36614 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -5136,6 +5136,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5350,6 +5351,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 617053713675..a0f2f534e9ac 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -5113,6 +5113,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5327,6 +5328,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 02dece85d138..41d317b43dd2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -5079,6 +5079,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "nikepub" = dontDistribute super."nikepub"; "nimber" = dontDistribute super."nimber"; "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; "nix-paths" = dontDistribute super."nix-paths"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; @@ -5291,6 +5292,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index da776308cbf7..e5122b92a6c7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -13625,6 +13625,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mesa;}; + "OpenGLRaw_2_5_5_0" = callPackage + ({ mkDerivation, base, bytestring, containers, mesa, text + , transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "2.5.5.0"; + sha256 = "6313c6ae052eed18b5e4b154819c1fd968e7b0a29b9ea556dff1ca7efa8b9635"; + libraryHaskellDepends = [ + base bytestring containers 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mesa;}; + "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: mkDerivation { @@ -32362,8 +32380,8 @@ self: { pname = "binary-orphans"; version = "0.1.1.0"; sha256 = "a34b6ea3a5485859c3d83aa6d1e4535e05590ef543d01482beba757db1d14431"; - revision = "3"; - editedCabalFile = "7c3abcc503031ccbe6c876008c89ffef8f579777949438d2002936e274ee9359"; + revision = "4"; + editedCabalFile = "fa36536e5eb88459d26333acce69efd1e861e11d8cc87f9ce7e3a4ebfec74601"; libraryHaskellDepends = [ aeson base binary hashable scientific tagged text text-binary time unordered-containers vector vector-binary-instances @@ -32377,6 +32395,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-orphans_0_1_2_0" = callPackage + ({ mkDerivation, aeson, base, binary, hashable + , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck + , text, text-binary, time, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-orphans"; + version = "0.1.2.0"; + sha256 = "7f83406c0b9c08df9d0d731f9616333f74422d5559fa1b1dc7c56aaf415605ab"; + libraryHaskellDepends = [ + aeson base binary hashable scientific tagged text text-binary time + unordered-containers vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary hashable 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, mtl }: mkDerivation { @@ -38742,15 +38784,17 @@ self: { }: mkDerivation { pname = "calculator"; - version = "0.4.1.0"; - sha256 = "70c38b6de3da91feaef7838e8ea8c2235a58a2076d8483d39a2165dcdc63f4bd"; + version = "0.4.1.1"; + sha256 = "9601f78d63c42c7382990d33ca475a947f8d8317d6dbf47819345693fdb4442d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers gtk haskeline hmatrix parsec plot-gtk-ui transformers ]; - testHaskellDepends = [ base containers parsec QuickCheck ]; + testHaskellDepends = [ + base containers gtk parsec plot-gtk-ui QuickCheck + ]; homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = stdenv.lib.licenses.gpl2; @@ -45015,11 +45059,10 @@ self: { ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { pname = "composition-tree"; - version = "0.1.0.1"; - sha256 = "44592c6ad20bea7e0f74623c4107d4637bdcea2e15321255e9c6a852e65e5064"; + version = "0.1.1.0"; + sha256 = "c9272752122468297cd8212bad4b75dbb5c534a7cbedce08b603e118d0119c8c"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; - jailbreak = true; homepage = "https://github.com/liamoc/composition-tree"; description = "Composition trees for arbitrary monoids"; license = stdenv.lib.licenses.bsd3; @@ -56182,6 +56225,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "digestive-functors-aeson_1_1_18" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , digestive-functors, HUnit, lens, lens-aeson, mtl, safe + , scientific, tasty, tasty-hunit, text, vector + }: + mkDerivation { + pname = "digestive-functors-aeson"; + version = "1.1.18"; + sha256 = "125cc4e14f3b9f67163b66f7ebf05c88137e4446ee79085d0ea550614ab483ad"; + libraryHaskellDepends = [ + aeson base containers digestive-functors lens lens-aeson safe text + vector + ]; + testHaskellDepends = [ + aeson base bytestring digestive-functors HUnit mtl scientific tasty + tasty-hunit text + ]; + homepage = "http://github.com/ocharles/digestive-functors-aeson"; + description = "Run digestive-functors forms against JSON"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "digestive-functors-blaze" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, digestive-functors , text @@ -57377,7 +57443,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "distributed-process-simplelocalnet" = callPackage + "distributed-process-simplelocalnet_0_2_3_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-accessor, distributed-process, network, network-multicast , network-transport, network-transport-tcp, transformers @@ -57397,6 +57463,28 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Simple zero-configuration backend for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "distributed-process-simplelocalnet" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-accessor, distributed-process, network, network-multicast + , network-transport, network-transport-tcp, transformers + }: + mkDerivation { + pname = "distributed-process-simplelocalnet"; + version = "0.2.3.1"; + sha256 = "0efd9566945f5927eff128d928baa094720ef29ceec213fd3799e36ae3bcf1b5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers data-accessor distributed-process + network network-multicast network-transport network-transport-tcp + transformers + ]; + homepage = "http://haskell-distributed.github.com"; + description = "Simple zero-configuration backend for Cloud Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "distributed-process-supervisor_0_1_2" = callPackage @@ -114903,15 +114991,16 @@ self: { "logger" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, lens, mtl - , template-haskell, time, transformers, unagi-chan + , template-haskell, time, time-locale-compat, transformers + , transformers-compat, unagi-chan }: mkDerivation { pname = "logger"; - version = "0.1.0.0"; - sha256 = "75a33ad12870d4b359576cb7411996eab019e300914935cca7234c32762446ec"; + version = "0.1.0.1"; + sha256 = "c8f23889771166abed2a043d83e907fd8368d7c8f12c6f15e36099c1f20ffdf3"; libraryHaskellDepends = [ ansi-wl-pprint base containers lens mtl template-haskell time - transformers unagi-chan + time-locale-compat transformers transformers-compat unagi-chan ]; jailbreak = true; homepage = "https://github.com/wdanilo/haskell-logger"; @@ -120533,6 +120622,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "moesocks_1_0_0_30" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens + , lens-aeson, mtl, network, optparse-applicative, random, stm + , strict, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "moesocks"; + version = "1.0.0.30"; + sha256 = "bdbc824d5d6c2732caedffe6874993b3e4fc8faef20982568288155afc54b554"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base binary bytestring containers cryptohash + hslogger HsOpenSSL iproute lens lens-aeson mtl network + optparse-applicative random stm strict text time transformers + unordered-containers + ]; + homepage = "https://github.com/nfjinjing/moesocks"; + description = "A functional firewall killer"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, filepath, html, HTTP, network @@ -127343,6 +127456,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nix-eval" = callPackage + ({ mkDerivation, base, process, QuickCheck, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "nix-eval"; + version = "0.1.0.1"; + sha256 = "5bc5c66fec46440d0a546ba4bfdd0c770080224f9a69fd6344d33cfc765677d4"; + libraryHaskellDepends = [ base process ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + homepage = "http://chriswarbo.net/git/nix-eval"; + description = "Evaluate Haskell expressions using Nix to get packages"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nix-paths" = callPackage ({ mkDerivation, base, nix, process }: mkDerivation { @@ -128678,6 +128806,7 @@ self: { homepage = "https://github.com/krdlab/haskell-oidc-client"; description = "OpenID Connect 1.0 library for RP"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ois-input-manager" = callPackage @@ -132378,6 +132507,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "patches-vector" = callPackage + ({ mkDerivation, base, doctest, edit-distance-vector, microlens + , QuickCheck, vector + }: + mkDerivation { + pname = "patches-vector"; + version = "0.1.0.0"; + sha256 = "569c80938fad6c296b0a5722e0e578bbc9509e521a3ce5bb3a341e1c4346a39e"; + libraryHaskellDepends = [ + base edit-distance-vector microlens vector + ]; + testHaskellDepends = [ base doctest QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/liamoc/patches-vector"; + description = "A library for patches (diffs) on vectors, composable and invertible"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path" = callPackage ({ mkDerivation, base, exceptions, filepath, hspec, HUnit, mtl , template-haskell From 67fb69c23bb0f5ffc9185120af85e775f9e2096e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Sep 2015 16:21:56 +0200 Subject: [PATCH 28/44] configuration-hackage2nix.yaml: update list of broken packages --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5ef99e049a6e..f1cba307c197 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2481,6 +2481,7 @@ dont-distribute-packages: nimber: [ i686-linux ] Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] + nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] nme: [ i686-linux, x86_64-linux, x86_64-darwin ] nm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2523,6 +2524,7 @@ dont-distribute-packages: ofx: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + oidc-client: [ i686-linux ] oi: [ i686-linux, x86_64-linux, x86_64-darwin ] ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2597,6 +2599,7 @@ dont-distribute-packages: passage: [ i686-linux, x86_64-linux, x86_64-darwin ] pastis: [ i686-linux, x86_64-linux, x86_64-darwin ] pasty: [ i686-linux, x86_64-linux, x86_64-darwin ] + patches-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] From 46f59a3a14dd32b873205a817420c68cfbe7f41c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Sep 2015 16:44:52 +0200 Subject: [PATCH 29/44] doc/default.nix: fix Emacs syntax highlighting (no functional change) --- doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index b68194b97a7b..004ffb70b749 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; buildCommand = '' - ln -s $sources/*.xml . # */ + ln -s "$sources/"*.xml . echo ${nixpkgsVersion} > .version @@ -37,7 +37,7 @@ stdenv.mkDerivation { cp ${./style.css} $dst/style.css mkdir -p $dst/images/callouts - cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/ + cp "${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 From a7840a9ce876680fab3302a5a3abf2624371cf0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Sep 2015 17:21:08 +0200 Subject: [PATCH 30/44] doc: generate haskell-users-guide.xml from Markdown input via Pandoc Editing Docbook is no fun, IMHO, so I'd rather store the Haskell documentation in Markdown format and use Pandoc to convert that into Docbook as part of the build process. --- doc/default.nix | 18 +- doc/haskell-users-guide.md | 698 +++++++++++++++++++++++++++ doc/haskell-users-guide.xml | 912 ------------------------------------ 3 files changed, 715 insertions(+), 913 deletions(-) create mode 100644 doc/haskell-users-guide.md delete mode 100644 doc/haskell-users-guide.xml diff --git a/doc/default.nix b/doc/default.nix index 004ffb70b749..b8dac00eb65e 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { sources = sourceFilesBySuffices ./. [".xml"]; - buildInputs = [ libxml2 libxslt ]; + buildInputs = [ pandoc libxml2 libxslt ]; xsltFlags = '' --param section.autolabel 1 @@ -19,6 +19,22 @@ stdenv.mkDerivation { ''; buildCommand = '' + { + echo "" + echo "" + echo "User's Guide to the Haskell Infrastructure" + echo "" + pandoc ${./haskell-users-guide.md} -w docbook | \ + sed -e 's|||' \ + -e 's|||' + echo "" + echo "" + } >haskell-users-guide.xml + ln -s "$sources/"*.xml . echo ${nixpkgsVersion} > .version diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md new file mode 100644 index 000000000000..b06a81e5b36a --- /dev/null +++ b/doc/haskell-users-guide.md @@ -0,0 +1,698 @@ +--- +title: User's Guide for Haskell in Nixpkgs +author: Peter Simons +date: 2015-06-01 +--- + +# How to install Haskell packages + +Nixpkgs distributes build instructions for all Haskell packages registered on +[Hackage](http://hackage.haskell.org/), but strangely enough normal Nix package +lookups don't seem to discover any of them, except for the default version of ghc, cabal-install, and stack: + + $ nix-env -i alex + error: selector ‘alex’ matches no derivations + $ nix-env -qa ghc + ghc-7.10.2 + +The Haskell package set is not registered in the top-level namespace because it +is *huge*. If all Haskell packages were visible to these commands, then +name-based search/install operations would be much slower than they are now. We +avoided that by keeping all Haskell-related packages in a separate attribute +set called `haskellPackages`, which the following command will list: + + $ nix-env -f "" -qaP -A haskellPackages + haskellPackages.a50 a50-0.5 + haskellPackages.abacate haskell-abacate-0.0.0.0 + haskellPackages.abcBridge haskell-abcBridge-0.12 + haskellPackages.afv afv-0.1.1 + haskellPackages.alex alex-3.1.4 + haskellPackages.Allure Allure-0.4.101.1 + haskellPackages.alms alms-0.6.7 + [... some 8000 entries omitted ...] + +To install any of those packages into your profile, refer to them by their +attribute path (first column): + + $ nix-env -f "" -iA haskellPackages.Allure ... + +The attribute path of any Haskell packages corresponds to the name of that +particular package on Hackage: the package `cabal-install` has the attribute +`haskellPackages.cabal-install`, and so on. (Actually, this convention causes +trouble with packages like `3dmodels` and `4Blocks`, because these names are +invalid identifiers in the Nix language. The issue of how to deal with these +rare corner cases is currently unresolved.) + +Haskell packages who's Nix name (second column) begins with a `haskell-` prefix +are packages that provide a library whereas packages without that prefix +provide just executables. Libraries may provide executables too, though: the +package `haskell-pandoc`, for example, installs both a library and an +application. You can install and use Haskell executables just like any other +program in Nixpkgs, but using Haskell libraries for development is a bit +trickier and we'll address that subject in great detail in section [How to +create a development environment]. + +Attribute paths are deterministic inside of Nixpkgs, but the path necessary to +reach Nixpkgs varies from system to system. We dodged that problem by giving +`nix-env` an explicit `-f ""` parameter, but if you call `nix-env` +without that flag, then chances are the invocation fails: + + $ nix-env -iA haskellPackages.cabal-install + error: attribute ‘haskellPackages’ in selection path + ‘haskellPackages.cabal-install’ not found + +On NixOS, for example, Nixpkgs does *not* exist in the top-level namespace by +default. To figure out the proper attribute path, it's easiest to query for the +path of a well-known Nixpkgs package, i.e.: + + $ nix-env -qaP coreutils + nixos.coreutils coreutils-8.23 + +If your system responds like that (most NixOS installations will), then the +attribute path to `haskellPackages` is `nixos.haskellPackages`. Thus, if you +want to use `nix-env` without giving an explicit `-f` flag, then that's the way +to do it: + + $ nix-env -qaP -A nixos.haskellPackages + $ nix-env -iA nixos.haskellPackages.cabal-install + +Our current default compiler is GHC 7.10.x and the `haskellPackages` set +contains packages built with that particular version. Nixpkgs contains the +latest major release of every GHC since 6.10.4, however, and there is a whole +family of package sets available that defines Hackage packages built with each +of those compilers, too: + + $ nix-env -f "" -qaP -A haskell.packages.ghc6123 + $ nix-env -f "" -qaP -A haskell.packages.ghc763 + +The name `haskellPackages` is really just a synonym for +`haskell.packages.ghc7102`, because we prefer that package set internally and +recommend it to our users as their default choice, but ultimately you are free +to compile your Haskell packages with any GHC version you please. The following +command displays the complete list of available compilers: + + $ nix-env -f "" -qaP -A haskell.compiler + haskell.compiler.ghc6104 ghc-6.10.4 + haskell.compiler.ghc6123 ghc-6.12.3 + haskell.compiler.ghc704 ghc-7.0.4 + haskell.compiler.ghc722 ghc-7.2.2 + haskell.compiler.ghc742 ghc-7.4.2 + haskell.compiler.ghc763 ghc-7.6.3 + haskell.compiler.ghc784 ghc-7.8.4 + haskell.compiler.ghc7102 ghc-7.10.2 + haskell.compiler.ghcHEAD ghc-7.11.20150402 + haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704 + haskell.compiler.ghcjs ghcjs-0.1.0 + haskell.compiler.jhc jhc-0.8.2 + haskell.compiler.uhc uhc-1.1.9.0 + +We have no package sets for `jhc` or `uhc` yet, unfortunately, but for every +version of GHC listed above, there exists a package set based on that compiler. +Also, the attributes `haskell.compiler.ghcXYC` and +`haskell.packages.ghcXYC.ghc` are synonymous for the sake of convenience. + +# How to create a development environment + +## How to install a compiler + +A simple development environment consists of a Haskell compiler and the tool +`cabal-install`, and we saw in section [How to install Haskell packages] how +you can install those programs into your user profile: + + $ nix-env -f "" -iA haskellPackages.ghc haskellPackages.cabal-install + +Instead of the default package set `haskellPackages`, you can also use the more +precise name `haskell.compiler.ghc7102`, which has the advantage that it refers +to the same GHC version regardless of what Nixpkgs considers "default" at any +given time. + +Once you've made those tools available in `$PATH`, it's possible to build +Hackage packages the same way people without access to Nix do it all the time: + + $ cabal get lens-4.11 && cd lens-4.11 + $ cabal install -j --dependencies-only + $ cabal configure + $ cabal build + +If you enjoy working with Cabal sandboxes, then that's entirely possible too: +just execute the command + + $ cabal sandbox init + +before installing the required dependencies. + +The `nix-shell` utility makes it easy to switch to a different compiler +version; just enter the Nix shell environment with the command + + $ nix-shell -p haskell.compiler.ghc784 + +to bring GHC 7.8.4 into `$PATH`. Re-running `cabal configure` switches your +build to use that compiler instead. If you're working on a project that doesn't +depend on any additional system libraries outside of GHC, then it's sufficient +even to run the `cabal configure` command inside of the shell: + + $ nix-shell -p haskell.compiler.ghc784 --command "cabal configure" + +Afterwards, all other commands like `cabal build` work just fine in any shell +environment, because the configure phase recorded the absolute paths to all +required tools like GHC in its build configuration inside of the `dist/` +directory. Please note, however, that `nix-collect-garbage` can break such an +environment because the Nix store paths created by `nix-shell` aren't "alive" +anymore once `nix-shell` has terminated. If you find that your Haskell builds +no longer work after garbage collection, then you'll have to re-run `cabal +configure` inside of a new `nix-shell` environment. + +## How to install a compiler with libraries + +GHC expects to find all installed libraries inside of its own `lib` directory. +This approach works fine on traditional Unix systems, but it doesn't work for +Nix, because GHC's store path is immutable once it's built. We cannot install +additional libraries into that location. As a consequence, our copies of GHC +don't know any packages except their own core libraries, like `base`, +`containers`, `Cabal`, etc. + +We can register additional libraries to GHC, however, using a special build +function called `ghcWithPackages`. That function expects one argument: a +function that maps from an attribute set of Haskell packages to a list of +packages, which determines the libraries known to that particular version of +GHC. For example, the Nix expression `ghcWithPackages (pkgs: [pkgs.mtl])` +generates a copy of GHC that has the `mtl` library registered in addition to +its normal core packages: + + $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" + + [nix-shell:~]$ ghc-pkg list mtl + /nix/store/zy79...-ghc-7.10.2/lib/ghc-7.10.2/package.conf.d: + mtl-2.2.1 + +This function allows users to define their own development environment by means +of an override. After adding the following snippet to `~/.nixpkgs/config.nix`, + + { + packageOverrides = super: let self = super.pkgs; in + { + myHaskellEnv = self.haskell.packages.ghc7102.ghcWithPackages + (haskellPackages: with haskellPackages; [ + # libraries + arrows async cgi criterion + # tools + cabal-install haskintex + ]); + }; + } + +it's possible to install that compiler with `nix-env -f "" -iA +myHaskellEnv`. If you'd like to switch that development environment to a +different version of GHC, just replace the `ghc7102` bit in the previous +definition with the appropriate name. Of course, it's also possible to define +any number of these development environments! (You can't install two of them +into the same profile at the same time, though, because that would result in +file conflicts.) + +The generated `ghc` program is a wrapper script that re-directs the real +GHC executable to use a new `lib` directory --- one that we specifically +constructed to contain all those packages the user requested: + + $ cat $(type -p ghc) + #! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e + export NIX_GHC=/nix/store/19sm...-ghc-7.10.2/bin/ghc + export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.2/bin/ghc-pkg + export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.2/share/doc/ghc/html + export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.2/lib/ghc-7.10.2 + exec /nix/store/j50p...-ghc-7.10.2/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" + +The variables `$NIX_GHC`, `$NIX_GHCPKG`, etc. point to the *new* store path +`ghcWithPackages` constructed specifically for this environment. The last line +of the wrapper script then executes the real `ghc`, but passes the path to the +new `lib` directory using GHC's `-B` flag. + +The purpose of those environment variables is to work around an impurity in the +popular [ghc-paths](http://hackage.haskell.org/package/ghc-paths) library. That +library promises to give its users access to GHC's installation paths. Only, +the library can't possible know that path when it's compiled, because the path +GHC considers its own is determined only much later, when the user configures +it through `ghcWithPackages`. So we [patched +ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/ghc-paths-nix.patch) +to return the paths found in those environment variables at run-time rather +than trying to guess them at compile-time. + +To make sure that mechanism works properly all the time, we recommend that you +set those variables to meaningful values in your shell environment, too, i.e. +by adding the following code to your `~/.bashrc`: + + if type >/dev/null 2>&1 -p ghc; then + eval "$(egrep ^export "$(type -p ghc)")" + fi + +If you are certain that you'll use only one GHC environment which is located in +your user profile, then you can use the following code, too, which has the +advantage that it doesn't contain any paths from the Nix store, i.e. those +settings always remain valid even if a `nix-env -u` operation updates the GHC +environment in your profile: + + if [ -e ~/.nix-profile/bin/ghc ]; then + export NIX_GHC="$HOME/.nix-profile/bin/ghc" + export NIX_GHCPKG="$HOME/.nix-profile/bin/ghc-pkg" + export NIX_GHC_DOCDIR="$HOME/.nix-profile/share/doc/ghc/html" + export NIX_GHC_LIBDIR="$HOME/.nix-profile/lib/ghc-$($NIX_GHC --numeric-version)" + fi + +## How to install a compiler with libraries, hoogle and documentation indexes + +If you plan to use your environment for interactive programming, not just +compiling random Haskell code, you might want to replace `ghcWithPackages` in +all the listings above with `ghcWithHoogle`. + +This environment generator not only produces an environment with GHC and all +the specified libraries, but also generates a `hoogle` and `haddock` indexes +for all the packages, and provides a wrapper script around `hoogle` binary that +uses all those things. A precise name for this thing would be +"`ghcWithPackagesAndHoogleAndDocumentationIndexes`", which is, regrettably, too +long and scary. + +For example, installing the following environment + + { + packageOverrides = super: let self = super.pkgs; in + { + myHaskellEnv = self.haskellPackages.ghcWithHoogle + (haskellPackages: with haskellPackages; [ + # libraries + arrows async cgi criterion + # tools + cabal-install haskintex + ]); + }; + } + +allows one to browse module documentation index [not too dissimilar to +this](https://downloads.haskell.org/~ghc/latest/docs/html/libraries/index.html) +for all the specified packages and their dependencies by directing a browser of +choice to `~/.nix-profiles/share/doc/hoogle/index.html` (or +`/run/current-system/sw/share/doc/hoogle/index.html` in case you put it in +`environment.systemPackages` in NixOS). + +After you've marveled enough at that try adding the following to your +`~/.ghc/ghci.conf` + + :def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\"" + :def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\"" + +and test it by typing into `ghci`: + + :hoogle a -> a + :doc a -> a + +Be sure to note the links to `haddock` files in the output. With any modern and +properly configured terminal emulator you can just click those links to +navigate there. + +Finally, you can run + + hoogle server -p 8080 + +and navigate to http://localhost:8080/ for your own local +[Hoogle](https://www.haskell.org/hoogle/). Note, however, that Firefox and +possibly other browsers disallow navigation from `http:` to `file:` URIs for +security reasons, which might be quite an inconvenience. See [this +page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for +workarounds. + + +## How to create ad hoc environments for `nix-shell` + +The easiest way to create an ad hoc development environment is to run +`nix-shell` with the appropriate GHC environment given on the command-line: + + nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc])" + +For more sophisticated use-cases, however, it's more convenient to save the +desired configuration in a file called `shell.nix` that looks like this: + + { nixpkgs ? import {}, compiler ? "ghc7102" }: + let + inherit (nixpkgs) pkgs; + ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [ + monad-par mtl + ]); + in + pkgs.stdenv.mkDerivation { + name = "my-haskell-env-0"; + buildInputs = [ ghc ]; + shellHook = "eval $(egrep ^export ${ghc}/bin/ghc)"; + } + +Now run `nix-shell` --- or even `nix-shell --pure` --- to enter a shell +environment that has the appropriate compiler in `$PATH`. If you use `--pure`, +then add all other packages that your development environment needs into the +`buildInputs` attribute. If you'd like to switch to a different compiler +version, then pass an appropriate `compiler` argument to the expression, i.e. +`nix-shell --argstr compiler ghc784`. + +If you need such an environment because you'd like to compile a Hackage package +outside of Nix --- i.e. because you're hacking on the latest version from Git +---, then the package set provides suitable nix-shell environments for you +already! Every Haskell package has an `env` attribute that provides a shell +environment suitable for compiling that particular package. If you'd like to +hack the `lens` library, for example, then you just have to check out the +source code and enter the appropriate environment: + + $ cabal get lens-4.11 && cd lens-4.11 + Downloading lens-4.11... + Unpacking to lens-4.11/ + + $ nix-shell "" -A haskellPackages.lens.env + [nix-shell:/tmp/lens-4.11]$ + +At point, you can run `cabal configure`, `cabal build`, and all the other +development commands. Note that you need `cabal-install` installed in your +`$PATH` already to use it here --- the `nix-shell` environment does not provide +it. + +# How to create Nix builds for your own private Haskell packages + +If your own Haskell packages have build instructions for Cabal, then you can +convert those automatically into build instructions for Nix using the +`cabal2nix` utility, which you can install into your profile by running +`nix-env -i cabal2nix`. + +## How to build a stand-alone project + +For example, let's assume that you're working on a private project called +`foo`. To generate a Nix build expression for it, change into the project's +top-level directory and run the command: + + $ cabal2nix . >foo.nix + +Then write the following snippet into a file called `default.nix`: + + { nixpkgs ? import {}, compiler ? "ghc7102" }: + nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } + +Finally, store the following code in a file called `shell.nix`: + + { nixpkgs ? import {}, compiler ? "ghc7102" }: + (import ./default.nix { inherit nixpkgs compiler; }).env + +At this point, you can run `nix-build` to have Nix compile your project and +install it into a Nix store path. The local directory will contain a symlink +called `result` after `nix-build` returns that points into that location. Of +course, passing the flag `--argstr compiler ghc763` allows switching the build +to any version of GHC currently supported. + +Furthermore, you can call `nix-shell` to enter an interactive development +environment in which you can use `cabal configure` and `cabal build` to develop +your code. That environment will automatically contain a proper GHC derivation +with all the required libraries registered as well as all the system-level +libraries your package might need. + +If your package does not depend on any system-level libraries, then it's +sufficient to run + + $ nix-shell --command "cabal configure" + +once to set up your build. `cabal-install` determines the absolute paths to all +resources required for the build and writes them into a config file in the +`dist/` directory. Once that's done, you can run `cabal build` and any other +command for that project even outside of the `nix-shell` environment. This +feature is particularly nice for those of us who like to edit their code with +an IDE, like Emacs' `haskell-mode`, because it's not necessary to start Emacs +inside of nix-shell just to make it find out the necessary settings for +building the project; `cabal-install` has already done that for us. + +If you want to do some quick-and-dirty hacking and don't want to bother setting +up a `default.nix` and `shell.nix` file manually, then you can use the +`--shell` flag offered by `cabal2nix` to have it generate a stand-alone +`nix-shell` environment for you. With that feature, running + + $ cabal2nix --shell . >shell.nix + $ nix-shell --command "cabal configure" + +is usually enough to set up a build environment for any given Haskell package. +You can even use that generated file to run `nix-build`, too: + + $ nix-build shell.nix + +## How to build projects that depend on each other + +If you have multiple private Haskell packages that depend on each other, then +you'll have to register those packages in the Nixpkgs set to make them visible +for the dependency resolution performed by `callPackage`. First of all, change +into each of your projects top-level directories and generate a `default.nix` +file with `cabal2nix`: + + $ cd ~/src/foo && cabal2nix . >default.nix + $ cd ~/src/bar && cabal2nix . >default.nix + +Then edit your `~/.nixpkgs/config.nix` file to register those builds in the +default Haskell package set: + + { + packageOverrides = super: let self = super.pkgs; in + { + haskellPackages = super.haskellPackages.override { + overrides = self: super: { + foo = self.callPackage ../src/foo {}; + bar = self.callPackage ../src/bar {}; + }; + }; + }; + } + +Once that's accomplished, `nix-env -f "" -qA haskellPackages` will +show your packages like any other package from Hackage, and you can build them + + $ nix-build "" -A haskellPackages.foo + +or enter an interactive shell environment suitable for building them: + + $ nix-shell "" -A haskellPackages.bar.env + +# Miscellaneous Topics + +## How to build with profiling enabled + +Every Haskell package set takes a function called `overrides` that you can use +to manipulate the package as much as you please. One useful application of this +feature is to replace the default `mkDerivation` function with one that enables +library profiling for all packages. To accomplish that, add configure the +following snippet in your `~/.nixpkgs/config.nix` file: + + { + packageOverrides = super: let self = super.pkgs; in + { + profiledHaskellPackages = self.haskellPackages.override { + overrides = self: super: { + mkDerivation = args: super.mkDerivation (args // { + enableLibraryProfiling = true; + }); + }; + }; + }; + } + +Then, replace instances of `haskellPackages` in the `cabal2nix`-generated +`default.nix` or `shell.nix` files with `profiledHaskellPackages`. + +## How to override package versions in a compiler-specific package set + +Nixpkgs provides the latest version of +[`ghc-events`](http://hackage.haskell.org/package/ghc-events), which is 0.4.4.0 +at the time of this writing. This is fine for users of GHC 7.10.x, but GHC +7.8.4 cannot compile that binary. Now, one way to solve that problem is to +register an older version of `ghc-events` in the 7.8.x-specific package set. +The first step is to generate Nix build instructions with `cabal2nix`: + + $ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix + +Then add the override in `~/.nixpkgs/config.nix`: + + { + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packages = super.haskell.packages // { + ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; + }; + }; + }; + }; + }; + } + +This code is a little crazy, no doubt, but it's necessary because the intuitive +version + + haskell.packages.ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; + }; + }; + +doesn't do what we want it to: that code replaces the `haskell` package set in +Nixpkgs with one that contains only one entry,`packages`, which contains only +one entry `ghc784`. This override loses the `haskell.compiler` set, and it +loses the `haskell.packages.ghcXYZ` sets for all compilers but GHC 7.8.4. To +avoid that problem, we have to perform the convoluted little dance from above, +iterating over each step in hierarchy. + +Once it's accomplished, however, we can install a variant of `ghc-events` +that's compiled with GHC 7.8.4: + + nix-env -f "" -iA haskell.packages.ghc784.ghc-events + +Unfortunately, it turns out that this build fails again while executing the +test suite! Apparently, the release archive on Hackage is missing some data +files that the test suite requires, so we cannot run it. We accomplish that by +re-generating the Nix expression with the `--no-check` flag: + + $ cabal2nix --no-check cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix + +Now the builds succeeds. + +Of course, in the concrete example of `ghc-events` this whole exercise is not +an ideal solution, because `ghc-events` can analyze the output emitted by any +version of GHC later than 6.12 regardless of the compiler version that was used +to build the `ghc-events' executable, so strictly speaking there's no reason to +prefer one built with GHC 7.8.x in the first place. However, for users who +cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an +older version might be useful. + +## How to recover from GHC's infamous non-deterministic library ID bug + +GHC and distributed build farms don't get along well: + + https://ghc.haskell.org/trac/ghc/ticket/4012 + +When you see an error like this one + + package foo-0.7.1.0 is broken due to missing package + text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91 + +then you have to download and re-install `foo` and all its dependents from +scratch: + + # nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \ + | xargs -L 1 nix-store --repair-path --option binary-caches http://hydra.nixos.org + +If you're using additional Hydra servers other than `hydra.nixos.org`, then it +might be necessary to purge the local caches that store data from those +machines to disable these binary channels for the duration of the previous +command, i.e. by running: + + rm /nix/var/nix/binary-cache-v3.sqlite + rm /nix/var/nix/manifests/* + rm /nix/var/nix/channel-cache/* + +## Builds on Darwin fail with `math.h` not found + +Users of GHC on Darwin have occasionally reported that builds fail, because the +compiler complains about a missing include file: + + fatal error: 'math.h' file not found + +The issue has been discussed at length in [ticket +6390](https://github.com/NixOS/nixpkgs/issues/6390), and so far no good +solution has been proposed. As a work-around, users who run into this problem +can configure the environment variables + + export NIX_CFLAGS_COMPILE="-idirafter /usr/include" + export NIX_CFLAGS_LINK="-L/usr/lib" + +in their `~/.bashrc` file to avoid the compiler error. + +## Using Stack together with Nix + + -- While building package zlib-0.5.4.2 using: + runhaskell -package=Cabal-1.22.4.0 -clear-package-db [... lots of flags ...] + Process exited with code: ExitFailure 1 + Logs have been written to: /home/foo/src/stack-ide/.stack-work/logs/zlib-0.5.4.2.log + + Configuring zlib-0.5.4.2... + Setup.hs: Missing dependency on a foreign library: + * Missing (or bad) header file: zlib.h + This problem can usually be solved by installing the system package that + provides this library (you may need the "-dev" version). If the library is + already installed but in a non-standard location then you can use the flags + --extra-include-dirs= and --extra-lib-dirs= to specify where it is. + If the header file does exist, it may contain errors that are caught by the C + compiler at the preprocessing stage. In this case you can re-run configure + with the verbosity flag -v3 to see the error messages. + +When you run the build inside of the nix-shell environment, the system +is configured to find libz.so without any special flags -- the compiler +and linker "just know" how to find it. Consequently, Cabal won't record +any search paths for libz.so in the package description, which means +that the package works fine inside of nix-shell, but once you leave the +shell the shared object can no longer be found. That issue is by no +means specific to Stack: you'll have that problem with any other +Haskell package that's built inside of nix-shell but run outside of that +environment. + +I suppose we could try to remedy the issue by wrapping `stack` or +`cabal` with a script that tries to find those kind of implicit search +paths and makes them explicit on the "cabal configure" command line. I +don't think anyone is working on that subject yet, though, because the +problem doesn't seem so bad in practice. + +You can remedy that issue in several ways. First of all, run + + $ nix-build --no-out-link "" -A zlib + /nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8 + +to find out the store path of the system's zlib library. Now, you can + +1) add that path (plus a "/lib" suffix) to your $LD_LIBRARY_PATH + environment variable to make sure your system linker finds libz.so + automatically. It's no pretty solution, but it will work. + +2) As a variant of (1), you can also install any number of system + libraries into your user's profile (or some other profile) and point + $LD_LIBRARY_PATH to that profile instead, so that you don't have to + list dozens of those store paths all over the place. + +3) The solution I prefer is to call stack with an appropriate + --extra-lib-dirs flag like so: + + $ stack --extra-lib-dirs=/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8/lib build + + Typically, you'll need --extra-include-dirs as well. It's possible + to add those flag to the project's "stack.yaml" or your user's + global "~/.stack/global/stack.yaml" file so that you don't have to + specify them manually every time. + + The same thing applies to `cabal configure`, of course, if you're + building with `cabal-install` instead of Stack. + + +# Other resources + +- The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE) + provides an introduction into Haskell NG aimed at beginners. The slides are + available at http://cryp.to/nixos-meetup-3-slides.pdf and also -- in a form + ready for cut & paste -- at + https://github.com/NixOS/cabal2nix/blob/master/doc/nixos-meetup-3-slides.md. + +- Another Youtube video is [Escaping Cabal Hell with Nix](https://www.youtube.com/watch?v=mQd3s57n_2Y), + which discusses the subject of Haskell development with Nix but also provides + a basic introduction to Nix as well, i.e. it's suitable for viewers with + almost no prior Nix experience. + +- Oliver Charles wrote a very nice [Tutorial how to develop Haskell packages with Nix](http://wiki.ocharles.org.uk/Nix). + +- The *Journey into the Haskell NG infrastructure* series of postings + describe the new Haskell infrastructure in great detail: + + - [Part 1](http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015591.html) + explains the differences between the old and the new code and gives + instructions how to migrate to the new setup. + + - [Part 2](http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015608.html) + looks in-depth at how to tweak and configure your setup by means of + overrides. + + - [Part 3](http://lists.science.uu.nl/pipermail/nix-dev/2015-April/016912.html) + describes the infrastructure that keeps the Haskell package set in Nixpkgs + up-to-date. diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml deleted file mode 100644 index 2e9fd4b4ca0e..000000000000 --- a/doc/haskell-users-guide.xml +++ /dev/null @@ -1,912 +0,0 @@ - - -User's Guide to the Haskell Infrastructure - -
- How to install Haskell packages - - Nixpkgs distributes build instructions for all Haskell packages - registered on - Hackage, but - strangely enough normal Nix package lookups don't seem to discover - any of them, except for the default version of ghc, cabal-install, and stack: - - -$ nix-env -i alex -error: selector ‘alex’ matches no derivations -$ nix-env -qa ghc -ghc-7.10.2 - - - The Haskell package set is not registered in the top-level namespace - because it is huge. If all Haskell packages - were visible to these commands, then name-based search/install - operations would be much slower than they are now. We avoided that - by keeping all Haskell-related packages in a separate attribute set - called haskellPackages, which the following - command will list: - - -$ nix-env -f "<nixpkgs>" -qaP -A haskellPackages -haskellPackages.a50 a50-0.5 -haskellPackages.abacate haskell-abacate-0.0.0.0 -haskellPackages.abcBridge haskell-abcBridge-0.12 -haskellPackages.afv afv-0.1.1 -haskellPackages.alex alex-3.1.4 -haskellPackages.Allure Allure-0.4.101.1 -haskellPackages.alms alms-0.6.7 -[... some 8000 entries omitted ...] - - - To install any of those packages into your profile, refer to them by - their attribute path (first column): - - -$ nix-env -f "<nixpkgs>" -iA haskellPackages.Allure ... - - - The attribute path of any Haskell packages corresponds to the name - of that particular package on Hackage: the package - cabal-install has the attribute - haskellPackages.cabal-install, and so on. - (Actually, this convention causes trouble with packages like - 3dmodels and 4Blocks, because - these names are invalid identifiers in the Nix language. The issue - of how to deal with these rare corner cases is currently - unresolved.) - - - Haskell packages who's Nix name (second column) begins with a - haskell- prefix are packages that provide a - library whereas packages without that prefix provide just - executables. Libraries may provide executables too, though: the - package haskell-pandoc, for example, installs - both a library and an application. You can install and use Haskell - executables just like any other program in Nixpkgs, but using - Haskell libraries for development is a bit trickier and we'll - address that subject in great detail in section - How to - create a development environment. - - - Attribute paths are deterministic inside of Nixpkgs, but the path - necessary to reach Nixpkgs varies from system to system. We dodged - that problem by giving nix-env an explicit - -f "<nixpkgs>" parameter, but if - you call nix-env without that flag, then chances - are the invocation fails: - - -$ nix-env -iA haskellPackages.cabal-install -error: attribute ‘haskellPackages’ in selection path - ‘haskellPackages.cabal-install’ not found - - - On NixOS, for example, Nixpkgs does not exist - in the top-level namespace by default. To figure out the proper - attribute path, it's easiest to query for the path of a well-known - Nixpkgs package, i.e.: - - -$ nix-env -qaP coreutils -nixos.coreutils coreutils-8.23 - - - If your system responds like that (most NixOS installations will), - then the attribute path to haskellPackages is - nixos.haskellPackages. Thus, if you want to - use nix-env without giving an explicit - -f flag, then that's the way to do it: - - -$ nix-env -qaP -A nixos.haskellPackages -$ nix-env -iA nixos.haskellPackages.cabal-install - - - Our current default compiler is GHC 7.10.x and the - haskellPackages set contains packages built with - that particular version. Nixpkgs contains the latest major release - of every GHC since 6.10.4, however, and there is a whole family of - package sets available that defines Hackage packages built with each - of those compilers, too: - - -$ nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc6123 -$ nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc763 - - - The name haskellPackages is really just a synonym - for haskell.packages.ghc7102, because we prefer - that package set internally and recommend it to our users as their - default choice, but ultimately you are free to compile your Haskell - packages with any GHC version you please. The following command - displays the complete list of available compilers: - - -$ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler -haskell.compiler.ghc6104 ghc-6.10.4 -haskell.compiler.ghc6123 ghc-6.12.3 -haskell.compiler.ghc704 ghc-7.0.4 -haskell.compiler.ghc722 ghc-7.2.2 -haskell.compiler.ghc742 ghc-7.4.2 -haskell.compiler.ghc763 ghc-7.6.3 -haskell.compiler.ghc784 ghc-7.8.4 -haskell.compiler.ghc7102 ghc-7.10.2 -haskell.compiler.ghcHEAD ghc-7.11.20150402 -haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704 -haskell.compiler.ghcjs ghcjs-0.1.0 -haskell.compiler.jhc jhc-0.8.2 -haskell.compiler.uhc uhc-1.1.9.0 - - - We have no package sets for jhc or - uhc yet, unfortunately, but for every version of - GHC listed above, there exists a package set based on that compiler. - Also, the attributes haskell.compiler.ghcXYC and - haskell.packages.ghcXYC.ghc are synonymous for - the sake of convenience. - -
-
- How to create a development environment -
- How to install a compiler - - A simple development environment consists of a Haskell compiler - and the tool cabal-install, and we saw in - section How to - install Haskell packages how you can install those programs - into your user profile: - - -$ nix-env -f "<nixpkgs>" -iA haskellPackages.ghc haskellPackages.cabal-install - - - Instead of the default package set - haskellPackages, you can also use the more - precise name haskell.compiler.ghc7102, which - has the advantage that it refers to the same GHC version - regardless of what Nixpkgs considers "default" at any - given time. - - - Once you've made those tools available in - $PATH, it's possible to build Hackage packages - the same way people without access to Nix do it all the time: - - -$ cabal get lens-4.11 && cd lens-4.11 -$ cabal install -j --dependencies-only -$ cabal configure -$ cabal build - - - If you enjoy working with Cabal sandboxes, then that's entirely - possible too: just execute the command - - -$ cabal sandbox init - - - before installing the required dependencies. - - - The nix-shell utility makes it easy to switch - to a different compiler version; just enter the Nix shell - environment with the command - - -$ nix-shell -p haskell.compiler.ghc784 - - - to bring GHC 7.8.4 into $PATH. Re-running - cabal configure switches your build to use that - compiler instead. If you're working on a project that doesn't - depend on any additional system libraries outside of GHC, then - it's sufficient even to run the cabal configure - command inside of the shell: - - -$ nix-shell -p haskell.compiler.ghc784 --command "cabal configure" - - - Afterwards, all other commands like cabal build - work just fine in any shell environment, because the configure - phase recorded the absolute paths to all required tools like GHC - in its build configuration inside of the dist/ - directory. Please note, however, that - nix-collect-garbage can break such an - environment because the Nix store paths created by - nix-shell aren't "alive" anymore once - nix-shell has terminated. If you find that your - Haskell builds no longer work after garbage collection, then - you'll have to re-run cabal configure inside of - a new nix-shell environment. - -
-
- How to install a compiler with libraries - - GHC expects to find all installed libraries inside of its own - lib directory. This approach works fine on - traditional Unix systems, but it doesn't work for Nix, because - GHC's store path is immutable once it's built. We cannot install - additional libraries into that location. As a consequence, our - copies of GHC don't know any packages except their own core - libraries, like base, - containers, Cabal, etc. - - - We can register additional libraries to GHC, however, using a - special build function called ghcWithPackages. - That function expects one argument: a function that maps from an - attribute set of Haskell packages to a list of packages, which - determines the libraries known to that particular version of GHC. - For example, the Nix expression - ghcWithPackages (pkgs: [pkgs.mtl]) generates a - copy of GHC that has the mtl library registered - in addition to its normal core packages: - - -$ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" - -[nix-shell:~]$ ghc-pkg list mtl -/nix/store/zy79...-ghc-7.10.2/lib/ghc-7.10.2/package.conf.d: - mtl-2.2.1 - - - This function allows users to define their own development - environment by means of an override. After adding the following - snippet to ~/.nixpkgs/config.nix, - - -{ - packageOverrides = super: let self = super.pkgs; in - { - myHaskellEnv = self.haskell.packages.ghc7102.ghcWithPackages - (haskellPackages: with haskellPackages; [ - # libraries - arrows async cgi criterion - # tools - cabal-install haskintex - ]); - }; -} - - - it's possible to install that compiler with - nix-env -f "<nixpkgs>" -iA myHaskellEnv. - If you'd like to switch that development environment to a - different version of GHC, just replace the - ghc7102 bit in the previous definition with the - appropriate name. Of course, it's also possible to define any - number of these development environments! (You can't install two - of them into the same profile at the same time, though, because - that would result in file conflicts.) - - - The generated ghc program is a wrapper script - that re-directs the real GHC executable to use a new - lib directory --- one that we specifically - constructed to contain all those packages the user requested: - - -$ cat $(type -p ghc) -#! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e -export NIX_GHC=/nix/store/19sm...-ghc-7.10.2/bin/ghc -export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.2/bin/ghc-pkg -export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.2/share/doc/ghc/html -export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.2/lib/ghc-7.10.2 -exec /nix/store/j50p...-ghc-7.10.2/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" - - - The variables $NIX_GHC, - $NIX_GHCPKG, etc. point to the - new store path - ghcWithPackages constructed specifically for - this environment. The last line of the wrapper script then - executes the real ghc, but passes the path to - the new lib directory using GHC's - -B flag. - - - The purpose of those environment variables is to work around an - impurity in the popular - ghc-paths - library. That library promises to give its users access to GHC's - installation paths. Only, the library can't possible know that - path when it's compiled, because the path GHC considers its own is - determined only much later, when the user configures it through - ghcWithPackages. So we - patched - ghc-paths to return the paths found in those environment - variables at run-time rather than trying to guess them at - compile-time. - - - To make sure that mechanism works properly all the time, we - recommend that you set those variables to meaningful values in - your shell environment, too, i.e. by adding the following code to - your ~/.bashrc: - - -if type >/dev/null 2>&1 -p ghc; then - eval "$(egrep ^export "$(type -p ghc)")" -fi - - - If you are certain that you'll use only one GHC environment which - is located in your user profile, then you can use the following - code, too, which has the advantage that it doesn't contain any - paths from the Nix store, i.e. those settings always remain valid - even if a nix-env -u operation updates the GHC - environment in your profile: - - -if [ -e ~/.nix-profile/bin/ghc ]; then - export NIX_GHC="$HOME/.nix-profile/bin/ghc" - export NIX_GHCPKG="$HOME/.nix-profile/bin/ghc-pkg" - export NIX_GHC_DOCDIR="$HOME/.nix-profile/share/doc/ghc/html" - export NIX_GHC_LIBDIR="$HOME/.nix-profile/lib/ghc-$($NIX_GHC --numeric-version)" -fi - -
-
- How to install a compiler with libraries, hoogle and documentation indexes - - If you plan to use your environment for interactive programming, - not just compiling random Haskell code, you might want to - replace ghcWithPackages in all the listings - above with ghcWithHoogle. - - - This environment generator not only produces an environment with - GHC and all the specified libraries, but also generates a - hoogle and haddock indexes - for all the packages, and provides a wrapper script around - hoogle binary that uses all those things. A - precise name for this thing would be - "ghcWithPackagesAndHoogleAndDocumentationIndexes", - which is, regrettably, too long and scary. - - - For example, installing the following environment - - -{ - packageOverrides = super: let self = super.pkgs; in - { - myHaskellEnv = self.haskellPackages.ghcWithHoogle - (haskellPackages: with haskellPackages; [ - # libraries - arrows async cgi criterion - # tools - cabal-install haskintex - ]); - }; -} - - - allows one to browse module documentation index not - too dissimilar to this for all the specified packages and - their dependencies by directing a browser of choice to - ~/.nix-profiles/share/doc/hoogle/index.html - (or - /run/current-system/sw/share/doc/hoogle/index.html - in case you put it in - environment.systemPackages in NixOS). - - - After you've marveled enough at that try adding the following to - your ~/.ghc/ghci.conf - - -:def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\"" -:def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\"" - - - and test it by typing into ghci: - - -:hoogle a -> a -:doc a -> a - - - Be sure to note the links to haddock files in - the output. With any modern and properly configured terminal - emulator you can just click those links to navigate there. - - - Finally, you can run - - -hoogle server -p 8080 - - - and navigate to for - your own local Hoogle. - Note, however, that Firefox and possibly other browsers disallow - navigation from http: to - file: URIs for security reasons, which might - be quite an inconvenience. See this - page for workarounds. - -
-
- How to create ad hoc environments for - <literal>nix-shell</literal> - - The easiest way to create an ad hoc development environment is to - run nix-shell with the appropriate GHC - environment given on the command-line: - - -nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc])" - - - For more sophisticated use-cases, however, it's more convenient to - save the desired configuration in a file called - shell.nix that looks like this: - - -{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: -let - inherit (nixpkgs) pkgs; - ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [ - monad-par mtl - ]); -in -pkgs.stdenv.mkDerivation { - name = "my-haskell-env-0"; - buildInputs = [ ghc ]; - shellHook = "eval $(egrep ^export ${ghc}/bin/ghc)"; -} - - - Now run nix-shell --- or even - nix-shell --pure --- to enter a shell - environment that has the appropriate compiler in - $PATH. If you use --pure, - then add all other packages that your development environment - needs into the buildInputs attribute. If you'd - like to switch to a different compiler version, then pass an - appropriate compiler argument to the - expression, i.e. - nix-shell --argstr compiler ghc784. - - - If you need such an environment because you'd like to compile a - Hackage package outside of Nix --- i.e. because you're hacking on - the latest version from Git ---, then the package set provides - suitable nix-shell environments for you already! Every Haskell - package has an env attribute that provides a - shell environment suitable for compiling that particular package. - If you'd like to hack the lens library, for - example, then you just have to check out the source code and enter - the appropriate environment: - - - $ cabal get lens-4.11 && cd lens-4.11 - Downloading lens-4.11... - Unpacking to lens-4.11/ - - $ nix-shell "<nixpkgs>" -A haskellPackages.lens.env - [nix-shell:/tmp/lens-4.11]$ - - - At point, you can run cabal configure, - cabal build, and all the other development - commands. Note that you need cabal-install - installed in your $PATH already to use it here - --- the nix-shell environment does not provide - it. - -
-
-
- How to create Nix builds for your own private Haskell - packages - - If your own Haskell packages have build instructions for Cabal, then - you can convert those automatically into build instructions for Nix - using the cabal2nix utility, which you can - install into your profile by running - nix-env -i cabal2nix. - -
- How to build a stand-alone project - - For example, let's assume that you're working on a private project - called foo. To generate a Nix build expression - for it, change into the project's top-level directory and run the - command: - - -$ cabal2nix . >foo.nix - - - Then write the following snippet into a file called - default.nix: - - -{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: -nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } - - - Finally, store the following code in a file called - shell.nix: - - -{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: -(import ./default.nix { inherit nixpkgs compiler; }).env - - - At this point, you can run nix-build to have - Nix compile your project and install it into a Nix store path. The - local directory will contain a symlink called - result after nix-build - returns that points into that location. Of course, passing the - flag --argstr compiler ghc763 allows switching - the build to any version of GHC currently supported. - - - Furthermore, you can call nix-shell to enter an - interactive development environment in which you can use - cabal configure and - cabal build to develop your code. That - environment will automatically contain a proper GHC derivation - with all the required libraries registered as well as all the - system-level libraries your package might need. - - - If your package does not depend on any system-level libraries, - then it's sufficient to run - - -$ nix-shell --command "cabal configure" - - - once to set up your build. cabal-install - determines the absolute paths to all resources required for the - build and writes them into a config file in the - dist/ directory. Once that's done, you can run - cabal build and any other command for that - project even outside of the nix-shell - environment. This feature is particularly nice for those of us who - like to edit their code with an IDE, like Emacs' - haskell-mode, because it's not necessary to - start Emacs inside of nix-shell just to make it find out the - necessary settings for building the project; - cabal-install has already done that for us. - - - If you want to do some quick-and-dirty hacking and don't want to - bother setting up a default.nix and - shell.nix file manually, then you can use the - --shell flag offered by - cabal2nix to have it generate a stand-alone - nix-shell environment for you. With that - feature, running - - -$ cabal2nix --shell . >shell.nix -$ nix-shell --command "cabal configure" - - - is usually enough to set up a build environment for any given - Haskell package. You can even use that generated file to run - nix-build, too: - - -$ nix-build shell.nix - -
-
- How to build projects that depend on each other - - If you have multiple private Haskell packages that depend on each - other, then you'll have to register those packages in the Nixpkgs - set to make them visible for the dependency resolution performed - by callPackage. First of all, change into each - of your projects top-level directories and generate a - default.nix file with - cabal2nix: - - -$ cd ~/src/foo && cabal2nix . >default.nix -$ cd ~/src/bar && cabal2nix . >default.nix - - - Then edit your ~/.nixpkgs/config.nix file to - register those builds in the default Haskell package set: - - - { - packageOverrides = super: let self = super.pkgs; in - { - haskellPackages = super.haskellPackages.override { - overrides = self: super: { - foo = self.callPackage ../src/foo {}; - bar = self.callPackage ../src/bar {}; - }; - }; - }; - } - - - Once that's accomplished, - nix-env -f "<nixpkgs>" -qA haskellPackages - will show your packages like any other package from Hackage, and - you can build them - - -$ nix-build "<nixpkgs>" -A haskellPackages.foo - - - or enter an interactive shell environment suitable for building - them: - - -$ nix-shell "<nixpkgs>" -A haskellPackages.bar.env - -
-
-
- Miscellaneous Topics -
- How to build with profiling enabled - - Every Haskell package set takes a function called - overrides that you can use to manipulate the - package as much as you please. One useful application of this - feature is to replace the default mkDerivation - function with one that enables library profiling for all packages. - To accomplish that, add configure the following snippet in your - ~/.nixpkgs/config.nix file: - - -{ - packageOverrides = super: let self = super.pkgs; in - { - profiledHaskellPackages = self.haskellPackages.override { - overrides = self: super: { - mkDerivation = args: super.mkDerivation (args // { - enableLibraryProfiling = true; - }); - }; - }; - }; -} - - - Then, replace instances of haskellPackages in the - cabal2nix-generated default.nix - or shell.nix files with - profiledHaskellPackages. - -
-
- How to override package versions in a compiler-specific - package set - - Nixpkgs provides the latest version of - ghc-events, - which is 0.4.4.0 at the time of this writing. This is fine for - users of GHC 7.10.x, but GHC 7.8.4 cannot compile that binary. - Now, one way to solve that problem is to register an older version - of ghc-events in the 7.8.x-specific package - set. The first step is to generate Nix build instructions with - cabal2nix: - - -$ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix - - - Then add the override in ~/.nixpkgs/config.nix: - - -{ - packageOverrides = super: let self = super.pkgs; in - { - haskell = super.haskell // { - packages = super.haskell.packages // { - ghc784 = super.haskell.packages.ghc784.override { - overrides = self: super: { - ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; - }; - }; - }; - }; - }; -} - - - This code is a little crazy, no doubt, but it's necessary because - the intuitive version - - -haskell.packages.ghc784 = super.haskell.packages.ghc784.override { - overrides = self: super: { - ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; - }; -}; - - - doesn't do what we want it to: that code replaces the - haskell package set in Nixpkgs with one that - contains only one entry,packages, which - contains only one entry ghc784. This override - loses the haskell.compiler set, and it loses - the haskell.packages.ghcXYZ sets for all - compilers but GHC 7.8.4. To avoid that problem, we have to perform - the convoluted little dance from above, iterating over each step - in hierarchy. - - - Once it's accomplished, however, we can install a variant of - ghc-events that's compiled with GHC 7.8.4: - - -nix-env -f "<nixpkgs>" -iA haskell.packages.ghc784.ghc-events - - - Unfortunately, it turns out that this build fails again while - executing the test suite! Apparently, the release archive on - Hackage is missing some data files that the test suite requires, - so we cannot run it. We accomplish that by re-generating the Nix - expression with the --no-check flag: - - -$ cabal2nix --no-check cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix - - - Now the builds succeeds. - - - Of course, in the concrete example of - ghc-events this whole exercise is not an ideal - solution, because ghc-events can analyze the - output emitted by any version of GHC later than 6.12 regardless of - the compiler version that was used to build the `ghc-events' - executable, so strictly speaking there's no reason to prefer one - built with GHC 7.8.x in the first place. However, for users who - cannot use GHC 7.10.x at all for some reason, the approach of - downgrading to an older version might be useful. - -
-
- How to recover from GHC's infamous non-deterministic library - ID bug - - GHC and distributed build farms don't get along well: - - -https://ghc.haskell.org/trac/ghc/ticket/4012 - - - When you see an error like this one - - -package foo-0.7.1.0 is broken due to missing package -text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91 - - - then you have to download and re-install foo - and all its dependents from scratch: - - -# nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \ - | xargs -L 1 nix-store --repair-path --option binary-caches http://hydra.nixos.org - - - If you're using additional Hydra servers other than - hydra.nixos.org, then it might be necessary to - purge the local caches that store data from those machines to - disable these binary channels for the duration of the previous - command, i.e. by running: - - -rm /nix/var/nix/binary-cache-v3.sqlite -rm /nix/var/nix/manifests/* -rm /nix/var/nix/channel-cache/* - -
-
- Builds on Darwin fail with <literal>math.h</literal> not - found - - Users of GHC on Darwin have occasionally reported that builds - fail, because the compiler complains about a missing include file: - - -fatal error: 'math.h' file not found - - - The issue has been discussed at length in - ticket - 6390, and so far no good solution has been proposed. As a - work-around, users who run into this problem can configure the - environment variables - - -export NIX_CFLAGS_COMPILE="-idirafter /usr/include" -export NIX_CFLAGS_LINK="-L/usr/lib" - - - in their ~/.bashrc file to avoid the compiler - error. - -
-
- -
- Other resources - - - - The Youtube video - Nix - Loves Haskell provides an introduction into Haskell NG - aimed at beginners. The slides are available at - http://cryp.to/nixos-meetup-3-slides.pdf and also -- in a form - ready for cut & paste -- at - https://github.com/NixOS/cabal2nix/blob/master/doc/nixos-meetup-3-slides.md. - - - - - Another Youtube video is - Escaping - Cabal Hell with Nix, which discusses the subject of - Haskell development with Nix but also provides a basic - introduction to Nix as well, i.e. it's suitable for viewers with - almost no prior Nix experience. - - - - - Oliver Charles wrote a very nice - Tutorial how to - develop Haskell packages with Nix. - - - - - The Journey into the Haskell NG - infrastructure series of postings describe the new - Haskell infrastructure in great detail: - - - - - Part - 1 explains the differences between the old and the - new code and gives instructions how to migrate to the new - setup. - - - - - Part - 2 looks in-depth at how to tweak and configure your - setup by means of overrides. - - - - - Part - 3 describes the infrastructure that keeps the - Haskell package set in Nixpkgs up-to-date. - - - - - -
- - From f35de8ea649ed98fc93ea9adfb85c25d151421a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 30 Sep 2015 17:25:39 +0200 Subject: [PATCH 31/44] jenkins: 1.594 -> 1.631 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 4b9a8280f5e4..ee18d297d430 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.594"; + version = "1.631"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1ypinl78avvir9499xargjbrzxv2b8kspjicsg8xzk5wsymzybn1"; + sha256 = "0bfh5gv3yk9awkzf660jxf9vzzdcr6qa9hl0hkivaj4gmp5f9sp8"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; From 3e600a805d7f89b520d68e7d51afd1a9ba936796 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 30 Sep 2015 10:53:52 -0500 Subject: [PATCH 32/44] quassel_qt5: fix build with Qt 5.5 --- pkgs/applications/networking/irc/quassel/qt-5.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/irc/quassel/qt-5.nix b/pkgs/applications/networking/irc/quassel/qt-5.nix index 8e75f16dbda4..b5075fe20758 100644 --- a/pkgs/applications/networking/irc/quassel/qt-5.nix +++ b/pkgs/applications/networking/irc/quassel/qt-5.nix @@ -43,6 +43,14 @@ in with stdenv; mkDerivation rec { sha256 = "15vqjiw38mifvnc95bhvy0zl23xxldkwg2byx9xqbyw8rfgggmkb"; }; + patches = [ + # fix build with Qt 5.5 + (fetchurl { + url = "https://github.com/quassel/quassel/commit/078477395aaec1edee90922037ebc8a36b072d90.patch"; + sha256 = "1njwnay7pjjw0g7m0x5cwvck8xcznc7jbdfyhbrd121nc7jgpbc5"; + }) + ]; + enableParallelBuilding = true; buildInputs = From d8c1284d816f966f2815d75e8041464301c14f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Sep 2015 18:14:34 +0200 Subject: [PATCH 33/44] pythonPackages: bump pyramid, webob and btrees --- .../python-modules/btrees-py35.patch | 79 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +-- 2 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/btrees-py35.patch diff --git a/pkgs/development/python-modules/btrees-py35.patch b/pkgs/development/python-modules/btrees-py35.patch new file mode 100644 index 000000000000..77e47d670b9b --- /dev/null +++ b/pkgs/development/python-modules/btrees-py35.patch @@ -0,0 +1,79 @@ +From eee0beef88d135640871050b40844272a3aee790 Mon Sep 17 00:00:00 2001 +From: Tres Seaver +Date: Tue, 15 Sep 2015 17:20:18 -0400 +Subject: [PATCH 1/2] Ensure that we don't overlook errors in first + PyObject_RichCompareBool call. + +Python 3.5 turns such cases into SystemErrors. + +See: https://bugs.python.org/issue23571 + +Fixes #15. +--- + BTrees/_compat.h | 22 +++++++++++++++++++--- + 1 file changed, 19 insertions(+), 3 deletions(-) + +diff --git a/BTrees/_compat.h b/BTrees/_compat.h +index e004d54..19dd377 100644 +--- a/BTrees/_compat.h ++++ b/BTrees/_compat.h +@@ -27,9 +27,25 @@ + #define TEXT_FROM_STRING PyUnicode_FromString + #define TEXT_FORMAT PyUnicode_Format + +-#define COMPARE(lhs, rhs) \ +- PyObject_RichCompareBool((lhs), (rhs), Py_LT) > 0 ? -1 : \ +- (PyObject_RichCompareBool((lhs), (rhs), Py_EQ) > 0 ? 0 : 1) ++/* Emulate Python2's __cmp__, wrapping PyObject_RichCompareBool(), ++ * Return -2/-3 for errors, -1 for lhsrhs. ++ */ ++static inline ++int __compare(PyObject *lhs, PyObject *rhs) { ++ int less, equal; ++ ++ less = PyObject_RichCompareBool(lhs, rhs, Py_LT); ++ if ( less == -1 ) { ++ return -2; ++ } ++ equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ); ++ if ( equal == -1 ) { ++ return -3; ++ } ++ return less ? -1 : (equal ? 0 : 1); ++} ++ ++#define COMPARE(lhs, rhs) __compare((lhs), (rhs)) + + + #else + +From ff4c3309fe471f2b9bdd642b8f7d1c2fe0f5e458 Mon Sep 17 00:00:00 2001 +From: Tres Seaver +Date: Sun, 20 Sep 2015 11:07:10 -0400 +Subject: [PATCH 2/2] Avoid unnecessary comparison for 'Py_EQ' if 'Py_LT' + returned True. + +--- + BTrees/_compat.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/BTrees/_compat.h b/BTrees/_compat.h +index 19dd377..ece2bf9 100644 +--- a/BTrees/_compat.h ++++ b/BTrees/_compat.h +@@ -38,11 +38,14 @@ int __compare(PyObject *lhs, PyObject *rhs) { + if ( less == -1 ) { + return -2; + } ++ if (less) { ++ return -1; ++ } + equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ); + if ( equal == -1 ) { + return -3; + } +- return less ? -1 : (equal ? 0 : 1); ++ return equal ? 0 : 1; + } + + #define COMPARE(lhs, rhs) __compare((lhs), (rhs)) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d28c13e322d..f472aec99c0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4533,15 +4533,15 @@ let }; pyramid = buildPythonPackage rec { - name = "pyramid-1.5.2"; + name = "pyramid-1.5.7"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz"; - md5 = "d56b140b41d42f818f4349d94d968c9a"; + sha256 = "1d29fj86724z68zcj9ximl2nrn34pflrlr6v9mwyhcv8rdf2sc61"; }; preCheck = '' - # test is failing, see https://github.com/Pylons/pyramid/issues/1405 + # this will be fixed for 1.6 release, see https://github.com/Pylons/pyramid/issues/1405 rm pyramid/tests/test_response.py ''; @@ -15600,12 +15600,12 @@ let }; webob = buildPythonPackage rec { - version = "1.4"; + version = "1.4.1"; name = "webob-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.tar.gz"; - md5 = "8437607c0cc00c35f658f972516ffb55"; + sha256 = "1nz9m6ijf46wfn33zfza13c0k1n4kjnmn3icdlrlgz5yj21vky0j"; }; propagatedBuildInputs = with self; [ nose ]; @@ -16049,6 +16049,8 @@ let sha256 = "1avvhkd7rvp3rzhw20v6ank8a8m9a1lmh99c4gjjsa1ry0zsri3y"; }; + patches = [ ../development/python-modules/btrees-py35.patch ]; + meta = { description = "scalable persistent components"; homepage = http://packages.python.org/BTrees; From c6d77eb0bf39005343426d8291b5a42c0a28a73b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 30 Sep 2015 18:29:08 +0200 Subject: [PATCH 34/44] nixos/tests/gnome3: wait for gnome shell to be started, for a better screenshot --- nixos/tests/gnome3.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index f5e0159f1c7d..7662efe1b350 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -28,7 +28,8 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); $machine->waitForWindow(qr/Terminal/); - $machine->sleep(20); + $machine->mustSucceed("timeout 60 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'"); + $machine->sleep(10); $machine->screenshot("screen"); ''; }) From c0a83cbc4977c725ce61e8a8172b66fe4e2e8396 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 30 Sep 2015 18:19:48 +0200 Subject: [PATCH 35/44] opentsdb nixos module: Add option for defining OpenTSDB's configuration --- nixos/modules/services/databases/opentsdb.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 9c9738570e3f..0e73d4aca0e6 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -5,10 +5,7 @@ with lib; let cfg = config.services.opentsdb; - configFile = pkgs.writeText "opentsdb.conf" '' - tsd.core.auto_create_metrics = true - tsd.http.request.enable_chunked = true - ''; + configFile = pkgs.writeText "opentsdb.conf" cfg.config; in { @@ -59,6 +56,17 @@ in { ''; }; + config = mkOption { + type = types.lines; + default = '' + tsd.core.auto_create_metrics = true + tsd.http.request.enable_chunked = true + ''; + description = '' + The contents of OpenTSDB's configuration file + ''; + }; + }; }; From 187854fced2eaf10adb3b5201f8c589c29cd7688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Sep 2015 19:00:33 +0200 Subject: [PATCH 36/44] update release notes for 15.09 (cherry picked from commit e13b657670dc02280a5f7b0f89538d9a2ac0444f) --- nixos/doc/manual/release-notes/rl-1509.xml | 109 ++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 5bed5c20c177..8de96029b631 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -4,13 +4,35 @@ version="5.0" xml:id="sec-release-15.09"> -Release 15.09 (“Dingo”, 2015/09/??) +Release 15.09 (“Dingo”, 2015/09/30) In addition to numerous new and upgraded packages, this release has the following highlights: + + Gnome has been upgraded to 3.16. + + + + + Xfce has been upgraded to 4.12. + + + + + KDE 5 has been upgraded to KDE Frameworks 5.10, + Plasma 5.3.2 and Applications 15.04.3. + KDE 4 has been updated to kdelibs-4.14.10. + + + + + E19 has been upgraded to 0.16.8.15. + + + The Haskell packages infrastructure has been re-designed from the ground up @@ -59,6 +81,80 @@ system.autoUpgrade.enable = true; + Following new services were added since the last release: + + + services/mail/exim.nix + services/misc/apache-kafka.nix + services/misc/canto-daemon.nix + services/misc/confd.nix + services/misc/devmon.nix + services/misc/gitit.nix + services/misc/ihaskell.nix + services/misc/mbpfan.nix + services/misc/mediatomb.nix + services/misc/mwlib.nix + services/misc/parsoid.nix + services/misc/plex.nix + services/misc/ripple-rest.nix + services/misc/ripple-data-api.nix + services/misc/subsonic.nix + services/misc/sundtek.nix + services/monitoring/cadvisor.nix + services/monitoring/das_watchdog.nix + services/monitoring/grafana.nix + services/monitoring/riemann-tools.nix + services/monitoring/teamviewer.nix + services/network-filesystems/u9fs.nix + services/networking/aiccu.nix + services/networking/asterisk.nix + services/networking/bird.nix + services/networking/charybdis.nix + services/networking/docker-registry-server.nix + services/networking/fan.nix + services/networking/firefox/sync-server.nix + services/networking/gateone.nix + services/networking/heyefi.nix + services/networking/i2p.nix + services/networking/lambdabot.nix + services/networking/mstpd.nix + services/networking/nix-serve.nix + services/networking/nylon.nix + services/networking/racoon.nix + services/networking/skydns.nix + services/networking/shout.nix + services/networking/softether.nix + services/networking/sslh.nix + services/networking/tinc.nix + services/networking/tlsdated.nix + services/networking/tox-bootstrapd.nix + services/networking/tvheadend.nix + services/networking/zerotierone.nix + services/scheduling/marathon.nix + services/security/fprintd.nix + services/security/hologram.nix + services/security/munge.nix + services/system/cloud-init.nix + services/web-servers/shellinabox.nix + services/web-servers/uwsgi.nix + services/x11/unclutter.nix + services/x11/display-managers/sddm.nix + system/boot/coredump.nix + system/boot/loader/loader.nix + system/boot/loader/generic-extlinux-compatible + system/boot/networkd.nix + system/boot/resolved.nix + system/boot/timesyncd.nix + tasks/filesystems/exfat.nix + tasks/filesystems/ntfs.nix + tasks/filesystems/vboxsf.nix + virtualisation/virtualbox-host.nix + virtualisation/vmware-guest.nix + virtualisation/xen-dom0.nix + + + + When upgrading from a previous release, please be aware of the following incompatible changes: @@ -244,6 +340,13 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc + + + Python 2.6 has been marked as broken (as it no longer recieves + security updates from upstream). + + + @@ -283,6 +386,10 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc until the next release. + + on all Python interpreters + is now available for nix-shell interoperability. + From 5374c07c15d8e5c50f401c44c88f747c23a1ecbb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Sep 2015 19:30:07 +0200 Subject: [PATCH 37/44] Tweak release notes --- nixos/doc/manual/release-notes/rl-1509.xml | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 8de96029b631..f41fdf7101da 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -11,28 +11,6 @@ has the following highlights: - - Gnome has been upgraded to 3.16. - - - - - Xfce has been upgraded to 4.12. - - - - - KDE 5 has been upgraded to KDE Frameworks 5.10, - Plasma 5.3.2 and Applications 15.04.3. - KDE 4 has been updated to kdelibs-4.14.10. - - - - - E19 has been upgraded to 0.16.8.15. - - - The Haskell packages infrastructure has been re-designed from the ground up @@ -78,10 +56,32 @@ system.autoUpgrade.enable = true; 3.18. + + Gnome has been upgraded to 3.16. + + + + + Xfce has been upgraded to 4.12. + + + + + KDE 5 has been upgraded to KDE Frameworks 5.10, + Plasma 5.3.2 and Applications 15.04.3. + KDE 4 has been updated to kdelibs-4.14.10. + + + + + E19 has been upgraded to 0.16.8.15. + + + - Following new services were added since the last release: +The following new services were added since the last release: services/mail/exim.nix @@ -152,7 +152,7 @@ system.autoUpgrade.enable = true; virtualisation/vmware-guest.nix virtualisation/xen-dom0.nix - + When upgrading from a previous release, please be aware of the From c39a55709532f6194e083303ee0b24fcca2d0df5 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Wed, 30 Sep 2015 01:31:45 -0700 Subject: [PATCH 38/44] claws-mail: add hicolor_icon_theme dependency We want the hicolor_icon_theme hook to strip Claws's icon-theme.cache. --- .../networking/mailreaders/claws-mail/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 23f5e4ec1bab..e98f59d3ed91 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv -, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, libarchive -, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager, openldap -, perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 +, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, hicolor_icon_theme +, libarchive, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager +, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 # Build options # TODO: A flag to build the manual. @@ -50,7 +50,9 @@ stdenv.mkDerivation { patches = [ ./mime.patch ]; buildInputs = - [ curl dbus dbus_glib gtk gnutls libetpan perl pkgconfig python ] + [ curl dbus dbus_glib gtk gnutls hicolor_icon_theme + libetpan perl pkgconfig python + ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optional enablePluginArchive libarchive From 4eb5068a13a934ee85f962cce464d7a9692c71b1 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Wed, 30 Sep 2015 09:50:51 -0700 Subject: [PATCH 39/44] claws-mail: fix conflict with shared_mime_info link Fixes #10156. Close #10157. --- pkgs/applications/networking/mailreaders/claws-mail/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index e98f59d3ed91..f226ff16a1c9 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.khumba ]; + priority = 10; # Resolve the conflict with the share/mime link we create. }; src = fetchurl { From 3231424c37be7b4edaf72ba1720aa6842ccda8de Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Sep 2015 21:12:46 +0200 Subject: [PATCH 40/44] Bump fallback Nix store paths --- nixos/modules/installer/tools/nixos-rebuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 7d0e5913cfb1..af19004cbddb 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -157,9 +157,9 @@ if [ -n "$buildNix" ]; then if ! nix-build '' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then machine="$(uname -m)" if [ "$machine" = x86_64 ]; then - nixStorePath=/nix/store/664kxr14kfgx4dl095crvmr7pbh9xlh5-nix-1.9 + nixStorePath=/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10 elif [[ "$machine" =~ i.86 ]]; then - nixStorePath=/nix/store/p7xdvz72xx3rhm121jclsbdmmcds7xh6-nix-1.9 + nixStorePath=/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10 else echo "$0: unsupported platform" exit 1 From 50146ce815707a0772869c59db287d7dc2964799 Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Mon, 18 May 2015 20:59:21 +0200 Subject: [PATCH 41/44] Add pkgs module argument documentation for #6794 incompatible change. --- nixos/doc/manual/release-notes/rl-1509.xml | 94 ++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index f41fdf7101da..404bf2dd810b 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -347,6 +347,100 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc + + + Any use of module argument such as pkgs to access + library functions, or to define imports attributes + will now lead to an infinite loop at the time of the evaluation. + + + + In case of infinite loop, use the --show-trace + command line argument and read the line just above the error message. + + +$ nixos-rebuild build --show-trace +… +while evaluating the module argument `pkgs' in "/etc/nixos/my-module.nix": +infinite recursion encountered + + + + + + Any use of pkgs.lib, should be replaced by + lib, after adding it as argument of the module. The + following module + + +{ config, pkgs, ... }: + +with pkgs.lib; + +{ + options = { + foo = mkOption { … }; + }; + config = mkIf config.foo { … }; +} + + + should be modified to look like: + + +{ config, pkgs, lib, ... }: + +with lib; + +{ + options = { + foo = mkOption { option declaration }; + }; + config = mkIf config.foo { option definition }; +} + + + + + When pkgs is used to download other projects to + import their modules, and only in such cases, it should be replaced by + (import <nixpkgs> {}). The following module + + +{ config, pkgs, ... }: + +let + myProject = pkgs.fetchurl { + src = url; + sha256 = hash; + }; +in + +{ + imports = [ "${myProject}/module.nix" ]; +} + + + should be modified to look like: + + +{ config, pkgs, ... }: + +let + myProject = (import <nixpkgs> {}).fetchurl { + src = url; + sha256 = hash; + }; +in + +{ + imports = [ "${myProject}/module.nix" ]; +} + + + + + From aca373c6b21afee58f436a25513957d360c60243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Sep 2015 21:26:41 +0200 Subject: [PATCH 42/44] typos --- nixos/doc/manual/release-notes/rl-1509.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 404bf2dd810b..5efd7e594a45 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -349,13 +349,13 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc - Any use of module argument such as pkgs to access + Any use of module arguments such as pkgs to access library functions, or to define imports attributes will now lead to an infinite loop at the time of the evaluation. - In case of infinite loop, use the --show-trace + In case of an infinite loop, use the --show-trace command line argument and read the line just above the error message. From 383377437e418fc0b4a0b66137e56dfb4f4925eb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Sep 2015 13:21:42 -0700 Subject: [PATCH 43/44] chromium: Updates Built and run locally - Beta: 46.0.2490.33 -> 46.0.2490.42 - Stable: 45.0.2454.99 -> 45.0.2454.101 --- .../browsers/chromium/source/sources.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 9ed001e06192..b80e3b534fbb 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -7,15 +7,15 @@ sha256bin64 = "1ycdp37ikdc9w4hp9qgpzjp47zh37g01ax8x4ack202vrv0dxhsh"; }; beta = { - version = "46.0.2490.33"; - sha256 = "196b49mqwkmz1i8qbrfmkxwd74wl40ncyyllj6kcfsq7mpms11ci"; - sha256bin32 = "0488cspmnk14jjb6v5c6y3070rmcxsfngyam5mg42q0fcz4593l1"; - sha256bin64 = "1kn0k8gpjnm1xsdiby76phwr0i8yb1w9mzmnf7ppj5cddikc5n3v"; + version = "46.0.2490.42"; + sha256 = "0nw6sc6vc5vm5j133hrjq06bibaljq5calqlmzha8ckx21zrr5yy"; + sha256bin32 = "1a1xi4w7f16chb9w1c102ya7890lj31c0fyyrwgvmpymlw9msnh0"; + sha256bin64 = "11758h6674d7g6c5bb820x1pg5z9q78j582kd0sa0p73g5888wd0"; }; stable = { - version = "45.0.2454.99"; - sha256 = "0h53gvgrs7f9sjw9vq21fr890f4qja0m2ja2c5ys1z5cs0gs7l8m"; - sha256bin32 = "18cc3vqvcfv1x11w1briis57fz53cdnmlxzzkrgs3585kw1q3m1d"; - sha256bin64 = "16pj25zvjiinc2wgvj2fwai6s2y5g8nx7j1p2s8bjix3hfnp26df"; + version = "45.0.2454.101"; + sha256 = "1yw5xlgy5hd3iwcyf0sillq5p367fcpvp4mizpmv52cwmv52ss0v"; + sha256bin32 = "1ll8lmkmx7v74naz1vcnrwk5ighh0skfcb66jkq4kgxrb5fjgwm5"; + sha256bin64 = "1cwbd3n77dnbfnrfr8g0qng9xkgvz6y7mx489gpx1wsamgi42bzj"; }; } From 647671bc537d35923fdaa6f7c03385868635d615 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Sep 2015 13:23:18 -0700 Subject: [PATCH 44/44] bluez5: 5.33 -> 5.35 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 72f4ea7f3339..b309b59f48ca 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.33"; + name = "bluez-5.35"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1lrn2irisr569m3fnrqhzsg77dgci55nlp5izv5phrjh2dx8008q"; + sha256 = "1qphz25hganfnd5ipfscbj7s70anv5favmwqmi9ig2saciaf1zhs"; }; pythonPath = with pythonPackages;